qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 119004: hw/virtio/virtio-balloon: move adding


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 119004: hw/virtio/virtio-balloon: move adding property to ...
Date: Mon, 01 Jun 2015 10:00:09 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1190044ea5a1c9a871664c4e2013072e51e56d5a
      
https://github.com/qemu/qemu/commit/1190044ea5a1c9a871664c4e2013072e51e56d5a
  Author: Shannon Zhao <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/virtio/virtio-balloon.c

  Log Message:
  -----------
  hw/virtio/virtio-balloon: move adding property to virtio_balloon_instance_init

This is in preparation for using alias property in virtio-balloon-pci
and virtio-balloon-ccw.

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 39b87c7b9f8bf3618e0357699d29615e521264d8
      
https://github.com/qemu/qemu/commit/39b87c7b9f8bf3618e0357699d29615e521264d8
  Author: Shannon Zhao <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/virtio/virtio-pci.c

  Log Message:
  -----------
  hw/virtio/virtio-pci: use alias property for virtio-balloon-pci

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: ecfa60e37439c870d08a90a845b061a53aa26f74
      
https://github.com/qemu/qemu/commit/ecfa60e37439c870d08a90a845b061a53aa26f74
  Author: Shannon Zhao <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/virtio-ccw.c

  Log Message:
  -----------
  hw/s390x/virtio-ccw: use alias property for virtio-balloon-ccw

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 4974920ab8fc8cf05687f1f764650dbc7c821004
      
https://github.com/qemu/qemu/commit/4974920ab8fc8cf05687f1f764650dbc7c821004
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Replace tab with spaces

Coding style change only.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f27086a731bbd0141646702c95f6dc5fce3e8575
      
https://github.com/qemu/qemu/commit/f27086a731bbd0141646702c95f6dc5fce3e8575
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/spapr.c
    M include/hw/compat.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw: Move commas inside HW_COMPAT_2_1 macro

Changing the convention to include commas inside the macros will allow
macros containing empty lists to be defined and used without compilation
errors.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: a7cde24dc2f104c8e5861df0e2938e79264e9d58
      
https://github.com/qemu/qemu/commit/a7cde24dc2f104c8e5861df0e2938e79264e9d58
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Move commas inside PC_COMPAT_* macros

Changing the convention to include commas inside the macros will allow
macros containing empty lists to be defined and used without compilation
errors.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: dd754baf46b6479a02521f671a0b58ffc799810e
      
https://github.com/qemu/qemu/commit/dd754baf46b6479a02521f671a0b58ffc799810e
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Move commas inside SPAPR_COMPAT_* macros

Changing the convention to include commas inside the macros will allow
macros containing empty lists to be defined and used without compilation
errors.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1edbde82b809f80b973978886d8232fbf280cb03
      
https://github.com/qemu/qemu/commit/1edbde82b809f80b973978886d8232fbf280cb03
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M include/hw/compat.h

  Log Message:
  -----------
  hw: Define empty HW_COMPAT_2_[23] macros

Now we can make everything consistent and define the macros even if they
are still empty.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 42134ac9d74799cf2f70257798b72a2988b75d31
      
https://github.com/qemu/qemu/commit/42134ac9d74799cf2f70257798b72a2988b75d31
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Define PC_COMPAT_2_[123] macros

Once we start adding compat code for pc-2.3, the usage of HW_COMPAT_2_1
in pc-*-2.2 won't be enough, as it also has to include PC_COMPAT_2_3
inside it. To ensure that, define PC_COMPAT_2_3, PC_COMPAT_2_2, and
PC_COMPAT_2_1 macros.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4dfd8eaa19c90087f19b56da5d04d9c468109a65
      
https://github.com/qemu/qemu/commit/4dfd8eaa19c90087f19b56da5d04d9c468109a65
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Use HW_COMPAT_* inside SPAPR_COMPAT_* macros

SPAPR_COMPAT_2_1 will need to include both HW_COMPAT_2_2 and
HW_COMPAT_2_1, so include HW_COMPAT_2_1 inside SPAPR_COMPAT_2_1 and
HW_COMPAT_2_2 inside SPAPR_COMPAT_2_2.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 38ff32c6e6fd966c5adb9cde4d393a8cca9ef093
      
https://github.com/qemu/qemu/commit/38ff32c6e6fd966c5adb9cde4d393a8cca9ef093
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: define SPAPR_COMPAT_2_3

Don't add the pseries-2.3 machine yet, but define the corresponding
SPAPR_COMPAT macro to make sure both pseries-2.2 and pseries-2.1 will
inherit HW_COMPAT_2_3.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: bb08d8829b5bec6af619e4532a397ef12727516c
      
https://github.com/qemu/qemu/commit/bb08d8829b5bec6af619e4532a397ef12727516c
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Move pc-0.14 qxl compat properties to PC_COMPAT_0_14

Those properties were introduced by commit
3827cdb1c3aa17a792d1658161195b9d7173c26b. They were not duplicated into
pc-0.13 and older because 0.14 was the first QEMU version supporting
qxl. The only problem is that this breaks the PC_COMPAT_* nesting
pattern we currently use.

So, move the properties to PC_COMPAT_0_14. This makes pc-0.13 and older
inherit them, but that shouldn't be an issue as QEMU 0.13 didn't support
qxl.

Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d5303df71073da70e0ad29a6dfb304ec7b747f5c
      
https://github.com/qemu/qemu/commit/d5303df71073da70e0ad29a6dfb304ec7b747f5c
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Move pc-0.11 drive version compat props to PC_COMPAT_0_11

The current code setting ide-drive.ver and scsi-disk.ver on pc-0.11
breaks the PC_COMPAT_* nesting pattern we currently use.

As those variables are overwritten in pc-0.10 too, they can be inherited
by pc-0.10 with no side-effects at all.

Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d765519bef48bd95f2139314a5354144387523eb
      
https://github.com/qemu/qemu/commit/d765519bef48bd95f2139314a5354144387523eb
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Move pc-0.13 virtio-9p-pci compat to PC_COMPAT_0_13

The compat property was added by commit
9dbcca5aa13cb9ab40788ac4c56bc227d94ca920, and the pc-0.12 and older
machine-types were not changed because virtio-9p-pci was introduced on QEMU
0.13 (commit 9f10751365b26b13b8a9b67e0e90536ae3d282df). The only problem is
that this breaks the PC_COMPAT_* nesting pattern we currently use.

So, move the property to PC_COMPAT_0_13. This make pc-0.12 and older inherit
it, but that shouldn't be an issue as QEMU 0.12 didn't have virtio-9p-pci.

Cc: Gerd Hoffmann <address@hidden>
Cc: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: faf7e4254fa33a13805a34a1ffeeb9dcc0a36a5e
      
https://github.com/qemu/qemu/commit/faf7e4254fa33a13805a34a1ffeeb9dcc0a36a5e
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Move pc-0.1[23] rombar compat props to PC_COMPAT_0_13

The VGA and vmware-svga rombar compat properties were added by commit
281a26b15b4adcecb8604216738975abd754bea8, but only to pc-0.13 and
pc-0.12. This breaks the PC_COMPAT_* nesting pattern we currently
follow.

The new variables will now be inherited by pc-0.11 and older, but
pc-0.11 and pc-0.10 already have PCI.rombar=0 on compat_props, so they
shouldn't be affected at all.

Cc: Stefan Weil <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84
      
https://github.com/qemu/qemu/commit/f6d5a0bad276ea97fac4e0efb0f41f54a3f1ac84
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Define PC_COMPAT_0_10

Move compat_props from pc-0.10 to the macro, to make it consistent with
the other machines.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b6b5c8e492ae7b71a16fe702b7409bff0feebfa7
      
https://github.com/qemu/qemu/commit/b6b5c8e492ae7b71a16fe702b7409bff0feebfa7
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Define MACHINE_OPTIONS macros consistently for all machines

Define a MACHINE_OPTIONS macro for each PC machine, and move every field
inside the QEMUMachine structs to the macros, except for name, init, and
compat_props.

This also ensures that all MACHINE_OPTIONS inherit the fields from the
next version, so their definitions carry only the changes that exist
between one version and the next one.

Comments about specific cases:

pc-*-2.1:

  Existing PC_*_2_1_MACHINE_OPTIONS macros were defined as:
      PC_*_MACHINE_OPTIONS,
      .default_machine_opts = "firmware=bios-256k.bin"

  PC_*_2_2_MACHINE_OPTIONS is:
      PC_*_2_3_MACHINE_OPTIONS
  which is expanded to:
      PC_*_MACHINE_OPTIONS,
      .default_machine_opts = "firmware=bios-256k.bin",
      .default_display = "std"

  The only difference between 2_1 and 2_2 is .default_display, that's why
  we didn't reuse PC_*_2_2_MACHINE_OPTIONS. The good news is that having
  multiple initializers for a field is allowed by C99, and the last
  initializer overrides the previous ones.

  So we can reuse the 2_2 macro in 2_1 and define PC_*_2_1_MACHINE_OPTIONS
  as:
      PC_*_2_2_MACHINE_OPTIONS,
      .default_display = NULL

pc-*-1.7:

  PC_*_1_7_MACHINE_OPTIONS was defined as:
      PC_*_MACHINE_OPTIONS

  PC_*_2_0_MACHINE_OPTIONS is defined as:
      PC_*_2_1_MACHINE_OPTIONS
  which is expanded to:
      PC_*_2_2_MACHINE_OPTIONS,
      .default_display = NULL
  which is expanded to:
      PC_*_2_3_MACHINE_OPTIONS,
      .default_display = NULL
  which is expanded to:
      PC_*_MACHINE_OPTIONS,
      .default_machine_opts = "firmware=bios-256k.bin",
      .default_display = "std",
      .default_display = NULL  /* overrides the previous line */

  So, the only difference between PC_*_1_7_MACHINE_OPTIONS and
  PC_*_2_0_MACHINE_OPTIONS is .default_machine_opts (as .default_display
  is not explicitly set by PC_*_MACHINE_OPTIONS so it is NULL).

  So we can keep the macro reuse pattern and define
  PC_*_2_0_MACHINE_OPTIONS as:
      PC_*_2_0_MACHINE_OPTIONS,
      .default_machine_opts = NULL

pc-*-2.4 (alias and is_default fields):

  Set alias and is_default fields inside the 2.4 MACHINE_OPTIONS macro,
  and clear it in the 2.3 macro (that reuses the 2.4 macro).

hw_machine:

  As all the machines older than v1.0 set hw_version explicitly, we can
  safely move the field to the MACHINE_OPTIONS macros without affecting
  the other versions that reuse them.

init function:

  Some machines had the init function set inside the MACHINE_OPTIONS
  macro. Move it to the QEMUMachine declaration, to keep it consistent
  with the other machines.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 61f219dfb093c0df91926928c780299cdf429619
      
https://github.com/qemu/qemu/commit/61f219dfb093c0df91926928c780299cdf429619
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Define machines using a DEFINE_PC_MACHINE macro

This will automatically generate the existing QEMUMachine structs based
on the *_MACHINE_OPTIONS macros, and automatically add registration code
for them.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: fddd179ab962f6f78a8493742e1068d6a620e059
      
https://github.com/qemu/qemu/commit/fddd179ab962f6f78a8493742e1068d6a620e059
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Convert *_MACHINE_OPTIONS macros into functions

By now the new functions will get QEMUMachine as argument, but they will
be later converted to initialize a MachineClass struct directly.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 25519b062c70f2afe2d2f0c262f3838a41e8bc7c
      
https://github.com/qemu/qemu/commit/25519b062c70f2afe2d2f0c262f3838a41e8bc7c
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Move compat_props setting inside *_machine_options() functions

This will simplify the DEFINE_PC_MACHINE macro, and will help us to
implement reuse of PC_COMPAT_* macros through class_init function reuse,
in the future.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 865906f7fdadd2732441ab158787f81f6a212bfe
      
https://github.com/qemu/qemu/commit/865906f7fdadd2732441ab158787f81f6a212bfe
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Don't use QEMUMachine anymore

Now that we have a DEFINE_PC_MACHINE helper macro that just requires an
initialization function, it is trivial to convert them to register a QOM
machine class directly, instead of using QEMUMachine.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d644b11657ae047d50d8ea9ce285ecd6dae04ca2
      
https://github.com/qemu/qemu/commit/d644b11657ae047d50d8ea9ce285ecd6dae04ca2
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Remove qemu_register_pc_machine() function

The helper is not needed anymore, as the PC machine classes are
registered using QOM directly.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d48f4fa69eb3efb03a2efe2e4606a97a17cf222f
      
https://github.com/qemu/qemu/commit/d48f4fa69eb3efb03a2efe2e4606a97a17cf222f
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M include/hw/boards.h
    M vl.c

  Log Message:
  -----------
  machine: Remove unused fields from QEMUMachine

This removes the following fields from QEMUMachine: family, alias,
reset, hot_add_cpu, units_per_default_bus, no_serial, no_parallel,
use_virtcon, use_sclp, no_floppy, no_cdrom, default_display,
compat_props, and hw_version.

The only users of those fields were already converted to use QOM and
MachineClass directly, so they are not needed anymore.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 72d164aa73b7c8d22a63b8ee789f97e4a8d2aa5c
      
https://github.com/qemu/qemu/commit/72d164aa73b7c8d22a63b8ee789f97e4a8d2aa5c
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Add kvmclock_enabled, pci_enabled globals

This looks like a step backwards, but it will allow pc-0.1[0123] and
isapc to follow the same compat+init pattern used by the other
machine-types, allowing us to generate all init function using the same
macro later.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 211b5b1d0a31f2f7593d6858a0b10487fb7b7fac
      
https://github.com/qemu/qemu/commit/211b5b1d0a31f2f7593d6858a0b10487fb7b7fac
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  piix: Eliminate pc_init_pci()

The function is not needed anymore, we can simply call pc_init1()
directly.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 99fbeafee8b568e796863980365080abdb8d675e
      
https://github.com/qemu/qemu/commit/99fbeafee8b568e796863980365080abdb8d675e
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Generate init functions with a macro

All pc-i440fx and pc-q35 init functions simply call the corresponding
compat function and then call the main init function. Use a macro to
generate that code.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 2332333c9738b442fbbd5b83a1eaa6be656ab9b5
      
https://github.com/qemu/qemu/commit/2332333c9738b442fbbd5b83a1eaa6be656ab9b5
  Author: Radim Krčmář <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

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

  Log Message:
  -----------
  pc: acpi: fix pvpanic for buggy guests

In the old times, we always had pvpanic in ACPI and a _STA method told
the guest not to use it.  Automatic generation dropped the _STA method
as the specification says that missing _STA means enabled and working.
Some guests (Linux) had buggy drivers and this change made them unable
to utilize pvpanic.

A Linux patch is posted as well, but I think it's worth to make pvpanic
useable on old guests at the price of three lines and few bytes of SSDT.

The old _STA method was
  Method (_STA, 0, NotSerialized) {
      Store (PEST, Local0)
      If (LEqual (Local0, Zero)) {
    Return (Zero) }
      Else {
    Return (0x0F) }}

Igor pointed out that we don't need to use a method to return a constant
and that 0xB (don't show in UI) is the common definition now.

Also, the device used to be PEVT.  (PEVT as in "panic event"?)

Signed-off-by: Radim Krčmář <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6b8f1020540c27246277377aa2c3331ad2bfb160
      
https://github.com/qemu/qemu/commit/6b8f1020540c27246277377aa2c3331ad2bfb160
  Author: Cornelia Huck <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/s390-virtio-bus.h
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-mmio.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio-bus.h
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: move host_features

Move host_features from the individual transport proxies into
the virtio device. Transports may continue to add feature bits
during device plugging.

This should it make easier to offer different sets of host features
for virtio-1/transitional support.

Tested-by: Shannon Zhao <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 13644819c5bf322ae4c2a415aca77d5dbde95fe8
      
https://github.com/qemu/qemu/commit/13644819c5bf322ae4c2a415aca77d5dbde95fe8
  Author: Cornelia Huck <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/virtio-ccw.c

  Log Message:
  -----------
  virtio-ccw: Don't advertise VIRTIO_F_BAD_FEATURE

This was copied from virtio-pci, but it doesn't make much sense for
ccw, as it doesn't have to handle the broken implementations this bit
is supposed to deal with. Remove it.

Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: cf34f533a161f8ced7322321d70ca00414d47473
      
https://github.com/qemu/qemu/commit/cf34f533a161f8ced7322321d70ca00414d47473
  Author: Cornelia Huck <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-mmio.c
    M hw/virtio/virtio-pci.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: move VIRTIO_F_NOTIFY_ON_EMPTY into core

Nearly all transports have been offering VIRTIO_F_NOTIFY_ON_EMPTY,
s390-virtio being the exception. There's no reason why it shouldn't
offer it as well, though (handling is done in core anyway), so let's
move it to the common virtio features.

While we're changing it anyway, fix the indentation for the
DEFINE_VIRTIO_COMMON_FEATURES macro.

Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: da51a335aa61ec0e45879d80f3c5e2ee4f87cd2f
      
https://github.com/qemu/qemu/commit/da51a335aa61ec0e45879d80f3c5e2ee4f87cd2f
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: adding all queues in .realize()

Instead of adding queues for multiqueue during feature set. This patch
did this in .realize(), this will help the following patches that
count the number of virtqueues used in .device_plugged() callback.

Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: e83980455c8c7eb066405de512be7c4bace3ac4d
      
https://github.com/qemu/qemu/commit/e83980455c8c7eb066405de512be7c4bace3ac4d
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio-bus.h

  Log Message:
  -----------
  virtio: device_plugged() can fail

This patch passes error pointer to transport specific device_plugged()
callback. Through this way, device_plugged() can do some transport
specific check and fail. This will be uesd by following patches that
check the number of virtqueues against the transport limitation.

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 8ad176aaed24535f535e0fdb03c538c23017535d
      
https://github.com/qemu/qemu/commit/8ad176aaed24535f535e0fdb03c538c23017535d
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: introduce virtio_get_num_queues()

This patch introduces virtio_get_num_queues() which iterates the vqs
array and return the number of virtqueues used by device.

Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 8dfbaa6ac450c4ec2646b1ca08a4017052a90c1d
      
https://github.com/qemu/qemu/commit/8dfbaa6ac450c4ec2646b1ca08a4017052a90c1d
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/virtio-ccw.c
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  virtio-ccw: introduce ccw specific queue limit

Cc: Alexander Graf <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 10ceaa1e8f9f74c917df1fe5db856817a8b26fe7
      
https://github.com/qemu/qemu/commit/10ceaa1e8f9f74c917df1fe5db856817a8b26fe7
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/virtio-ccw.c

  Log Message:
  -----------
  virtio-ccw: validate the number of queues against bus limitation

Cc: Cornelia Huck <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Alexander Graf <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 74c85296dc880568005b8e7572e08a39d66bcdca
      
https://github.com/qemu/qemu/commit/74c85296dc880568005b8e7572e08a39d66bcdca
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c

  Log Message:
  -----------
  virtio-s390: introduce virito s390 queue limit

Cc: Alexander Graf <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d820331a0b47cbbdc409b435545aea25e19b57ad
      
https://github.com/qemu/qemu/commit/d820331a0b47cbbdc409b435545aea25e19b57ad
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c

  Log Message:
  -----------
  virtio-s390: introduce virtio_s390_device_plugged()

This patch introduce a virtio-s390 specific device_plugged() function
and doing the number of virtqueue validation inside.

Cc: Alexander Graf <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 87b3bd1c858e6cacac4d403da9109ec3a04fe9d0
      
https://github.com/qemu/qemu/commit/87b3bd1c858e6cacac4d403da9109ec3a04fe9d0
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/char/virtio-serial-bus.c
    M hw/net/virtio-net.c
    M hw/scsi/virtio-scsi.c
    M hw/virtio/virtio-mmio.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: rename VIRTIO_PCI_QUEUE_MAX to VIRTIO_QUEUE_MAX

VIRTIO_PCI_QUEUE_MAX is not only used for pci, so rename it be generic.

Cc: Amit Shah <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b829c2a98f1f67308eb02fcddb52d8fa67775f18
      
https://github.com/qemu/qemu/commit/b829c2a98f1f67308eb02fcddb52d8fa67775f18
  Author: Jason Wang <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: increase the queue limit to 1024

Increase the queue limit to 1024. But virtio-ccw and s390-virtio won't
support this, this is done through failing device_plugged() for those
two transports if the number of virtqueues is greater than 64.

Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: fd53c87cf6651b0dfe9f5107cfe77d2f697bd4f6
      
https://github.com/qemu/qemu/commit/fd53c87cf6651b0dfe9f5107cfe77d2f697bd4f6
  Author: Laszlo Ersek <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  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:
  -----------
  i386/pc: pc_basic_device_init(): delegate FDC creation request

This patch introduces no observable change, but it allows the callers of
pc_basic_device_init(), ie. pc_init1() and pc_q35_init(), to request (or
not request) the creation of the FDC explicitly.

At the moment both callers pass constant create_fdctrl=true (hence no
observable change).

Assuming a board passes create_fdctrl=false, "floppy" will be NULL on
output, and (beyond the FDC not being created) that NULL will be passed on
to pc_cmos_init(). Luckily, pc_cmos_init() already handles that case.

Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: John Snow <address@hidden>
Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: address@hidden
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 936a7c1cf7410a3bab97c98301054921d47a8918
      
https://github.com/qemu/qemu/commit/936a7c1cf7410a3bab97c98301054921d47a8918
  Author: Laszlo Ersek <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc.c

  Log Message:
  -----------
  i386/pc: '-drive if=floppy' should imply a board-default FDC

Even if board code decides not to request the creation of the FDC (keyed
off board-level factors, to be determined later), we should create the FDC
nevertheless if the user passes '-drive if=floppy' on the command line.

Otherwise '-drive if=floppy' would break without explicit '-device
isa-fdc' on such boards.

Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: John Snow <address@hidden>
Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: address@hidden
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 6cd2234ccbacf2825372142a2658bf318ce2f848
      
https://github.com/qemu/qemu/commit/6cd2234ccbacf2825372142a2658bf318ce2f848
  Author: Laszlo Ersek <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  i386/pc_q35: don't insist on board FDC if there's no default floppy

The "no_floppy = 1" machine class setting causes "default_floppy" in
main() to become zero. Consequently, default_drive() will not call
drive_add() and drive_new() for IF_FLOPPY, index=0, meaning that no
default floppy drive will be created for the virtual machine. In that
case, board code should also not insist on the creation of the
board-default FDC.

The board-default FDC will still be created if the user requests a floppy
drive with "-drive if=floppy".

Additionally, separate FDCs can be specified manually with "-device
isa-fdc". They allow the

  -device isa-fdc,driveA=...

syntax that is more flexible than the one required by the board-default
FDC:

  -global isa-fdc.driveA=...

This patch doesn't change the behavior observably, as all Q35 machine
types have "no_floppy = 0".

Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: John Snow <address@hidden>
Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: address@hidden
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4
      
https://github.com/qemu/qemu/commit/ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4
  Author: Laszlo Ersek <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted

It is Very annoying to carry forward an outdatEd coNtroller with a mOdern
Machine type.

Hence, let us not instantiate the FDC when all of the following apply:
- the machine type is pc-q35-2.4 or later,
- "-device isa-fdc" is not passed on the command line (nor in the config
  file),
- no "-drive if=floppy,..." is requested.

Cc: Markus Armbruster <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: John Snow <address@hidden>
Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: address@hidden
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: c3bdc56c183f6ca6baa502bd7861583ca98b333b
      
https://github.com/qemu/qemu/commit/c3bdc56c183f6ca6baa502bd7861583ca98b333b
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

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

  Log Message:
  -----------
  acpi: Simplify printing to dynamic string

build_append_namestringv() and aml_string() first calculate the
resulting string's length with vsnprintf(NULL, ...), then allocate,
then print for real.  Simply use g_strdup_vprintf() or g_vasprintf()
instead.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>


  Commit: 38d40ff10f71657ea913a63d1f8477be368b92c1
      
https://github.com/qemu/qemu/commit/38d40ff10f71657ea913a63d1f8477be368b92c1
  Author: Pavel Fedin <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/pci/msi.c
    M hw/pci/msix.c
    M include/exec/memattrs.h
    M include/hw/pci/msi.h

  Log Message:
  -----------
  Add stream ID to MSI write

GICv3 ITS distinguishes between devices by using hardwired device IDs passed on 
the bus.
This patch implements passing these IDs in qemu.
SMMU is also known to use stream IDs, therefore this addition can also be 
useful for
implementing platforms with SMMU.

Signed-off-by: Pavel Fedin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>

 Changes from v1:
- Added bus number to the stream ID
- Added stream ID not only to MSI-X, but also to plain MSI. Some common code 
was made into
msi_send_message() function.
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 116694c34aa794a994051fce55bfee418fe1521d
      
https://github.com/qemu/qemu/commit/116694c34aa794a994051fce55bfee418fe1521d
  Author: Stefan Berger <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M backends/tpm.c
    M hw/tpm/tpm_int.h
    M hw/tpm/tpm_passthrough.c
    M hw/tpm/tpm_tis.c
    M hw/tpm/tpm_tis.h
    M include/sysemu/tpm.h
    M include/sysemu/tpm_backend.h

  Log Message:
  -----------
  Extend TPM TIS interface to support TPM 2

Following the recent upgrade to version 1.3, extend the TPM TIS
interface with capabilities introduced for support of a TPM 2.

TPM TIS for TPM 2 introduced the following extensions beyond the
TPM TIS 1.3 (used for TPM 1.2):

- A new 32bit interface Id register was introduced.
- New flags for the status (STS) register were defined.
- New flags for the capability flags were defined.

Support the above if a TPM TIS 1.3 for TPM 2 is used with a TPM 2
on the backend side. Support the old TPM TIS 1.3 configuration if a
TPM 1.2 is being used. A subsequent patch will then determine which
TPM version is being used in the backend.

Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 56a3c24ffc11955ddc7bb21362ca8069a3fc8c55
      
https://github.com/qemu/qemu/commit/56a3c24ffc11955ddc7bb21362ca8069a3fc8c55
  Author: Stefan Berger <address@hidden>
  Date:   2015-05-31 (Sun, 31 May 2015)

  Changed paths:
    M hw/tpm/Makefile.objs
    M hw/tpm/tpm_int.h
    M hw/tpm/tpm_passthrough.c
    A hw/tpm/tpm_util.c
    A hw/tpm/tpm_util.h

  Log Message:
  -----------
  tpm: Probe for connected TPM 1.2 or TPM 2

In the TPM passthrough backend driver, modify the probing code so
that we can check whether a TPM 1.2 or TPM 2 is being used
and adapt the behavior of the TPM TIS accordingly.

Move the code that tested for a TPM 1.2 into tpm_utils.c
and extend it with test for probing for TPM 2. Have the
function return the version of TPM found.

Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab
      
https://github.com/qemu/qemu/commit/5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab
  Author: Stefan Berger <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/i386/Makefile.objs
    M hw/i386/acpi-build.c
    M hw/i386/ssdt-tpm.dsl
    M hw/i386/ssdt-tpm.hex.generated
    A hw/i386/ssdt-tpm2.dsl
    A hw/i386/ssdt-tpm2.hex.generated
    M hw/tpm/tpm_tis.c
    M include/hw/acpi/acpi-defs.h
    M include/hw/acpi/tpm.h
    M include/sysemu/tpm.h

  Log Message:
  -----------
  TPM2 ACPI table support

Add a TPM2 ACPI table if a TPM 2 is used in the backend.
Also add an SSDT for the TPM 2.

Rename tpm_find() to tpm_get_version() and have this function
return the version of the TPM found, TPMVersion_Unspec if
no TPM is found. Use the version number to build version
specific ACPI tables.

Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c08cf0704247aa55e9b0bb14cf34d845629e0e3e
      
https://github.com/qemu/qemu/commit/c08cf0704247aa55e9b0bb14cf34d845629e0e3e
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_add() term

Add encoding for ACPI DefAdd Opcode.

Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>


  Commit: 96396e2858fd8a0b4ee218c9894b5a67d22d97d9
      
https://github.com/qemu/qemu/commit/96396e2858fd8a0b4ee218c9894b5a67d22d97d9
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_lless() term

Add encoding for ACPI DefLLess Opcode.

Reviewed-by: Shannon Zhao <address@hidden>
Reviewed-by: Igor Mammedov <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: 928b8996576875f9364f77c5a41f12cd55c7b9f7
      
https://github.com/qemu/qemu/commit/928b8996576875f9364f77c5a41f12cd55c7b9f7
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_index() term

Add encoding for ACPI DefIndex Opcode.

Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>


  Commit: a57dddddd2f93b87852fac2ed41a31c45e6d192a
      
https://github.com/qemu/qemu/commit/a57dddddd2f93b87852fac2ed41a31c45e6d192a
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_shiftleft() term

Add encoding for ACPI DefShiftLeft Opcode.

Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>


  Commit: f7bd7b8eb6573ed22bfc51e148455a1c0a1e36d0
      
https://github.com/qemu/qemu/commit/f7bd7b8eb6573ed22bfc51e148455a1c0a1e36d0
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_shiftright() term

Add encoding for ACPI DefShiftRight Opcode.

Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Shannon Zhao <address@hidden>


  Commit: af39d5363f373e6c1168a0e84658d6e4ef57fa8c
      
https://github.com/qemu/qemu/commit/af39d5363f373e6c1168a0e84658d6e4ef57fa8c
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/acpi/aml-build.c
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_increment() term

Add encoding for ACPI DefIncrement Opcode.

Reviewed-by: Shannon Zhao <address@hidden>
Reviewed-by: Igor Mammedov <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: 68e6b0af784dda4efd9d4e2e9d3b03a31ca1408c
      
https://github.com/qemu/qemu/commit/68e6b0af784dda4efd9d4e2e9d3b03a31ca1408c
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M include/hw/acpi/aml-build.h

  Log Message:
  -----------
  acpi: add aml_while() term

Add encoding for ACPI DefWhile Opcode.

Reviewed-by: Shannon Zhao <address@hidden>
Reviewed-by: Igor Mammedov <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: afcf905cff7971324c2706600ead35a1f41f417a
      
https://github.com/qemu/qemu/commit/afcf905cff7971324c2706600ead35a1f41f417a
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

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

  Log Message:
  -----------
  hw/acpi/aml-build: Fix memory leak

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>


  Commit: 434027badb421863b85ffdb4769966533c001cfa
      
https://github.com/qemu/qemu/commit/434027badb421863b85ffdb4769966533c001cfa
  Author: Ying-Shiuan Pan <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/virtio/virtio-mmio.c

  Log Message:
  -----------
  virtio-mmio: ioeventfd support

set_host_notifier and set_guest_notifiers supported by virtio-mmio now.
Most code copied from virtio-pci.

This makes it possible to use vhost-net with virtio-mmio,
improving performance by about 30%.

The kvm-arm does not yet support irqfd, need to fix the hard-coded part after
kvm-arm gets irqfd support.

Signed-off-by: Ying-Shiuan Pan <address@hidden>
Signed-off-by: Pavel Fedin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: fdba6d967e00864edd21275a6ee1d23a383510e8
      
https://github.com/qemu/qemu/commit/fdba6d967e00864edd21275a6ee1d23a383510e8
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/core/qdev-properties.c
    M include/hw/qdev-properties.h

  Log Message:
  -----------
  qdev: add 64bit properties

Needed for virtio features which go from 32bit to 64bit with virtio 1.0

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 019a3edbb25f1571e876f8af1ce4c55412939e5d
      
https://github.com/qemu/qemu/commit/019a3edbb25f1571e876f8af1ce4c55412939e5d
  Author: Gerd Hoffmann <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M hw/9pfs/virtio-9p-device.c
    M hw/block/virtio-blk.c
    M hw/char/virtio-serial-bus.c
    M hw/input/virtio-input.c
    M hw/net/virtio-net.c
    M hw/scsi/vhost-scsi.c
    M hw/scsi/virtio-scsi.c
    M hw/virtio/virtio-balloon.c
    M hw/virtio/virtio-rng.c
    M hw/virtio/virtio.c
    M include/hw/virtio/virtio.h

  Log Message:
  -----------
  virtio: make features 64bit wide

Make features 64bit wide everywhere.

On migration a full 64bit guest_features field is sent if one of the
high bits is set, in addition to the lower 32bit guest_features field
which must stay for compatibility reasons.  That way we send the lower
32 feature bits twice, but the code is simpler because we don't have
to split and compose the 64bit features into two 32bit fields.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 830d70db692e374b55555f4407f96a1ceefdcc97
      
https://github.com/qemu/qemu/commit/830d70db692e374b55555f4407f96a1ceefdcc97
  Author: Ouyang Changchun <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M docs/specs/vhost-user.txt
    M hw/net/vhost_net.c
    M hw/virtio/vhost-user.c
    M net/vhost-user.c
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  vhost-user: add multi queue support

Based on patch by Nikolay Nikolaev:
Vhost-user will implement the multi queue support in a similar way
to what vhost already has - a separate thread for each queue.
To enable the multi queue functionality - a new command line parameter
"queues" is introduced for the vhost-user netdev.

Signed-off-by: Nikolay Nikolaev <address@hidden>
Signed-off-by: Changchun Ouyang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3
      
https://github.com/qemu/qemu/commit/b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M backends/tpm.c
    M docs/specs/vhost-user.txt
    M hw/9pfs/virtio-9p-device.c
    M hw/acpi/aml-build.c
    M hw/block/virtio-blk.c
    M hw/char/virtio-serial-bus.c
    M hw/core/qdev-properties.c
    M hw/i386/Makefile.objs
    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/ssdt-tpm.dsl
    M hw/i386/ssdt-tpm.hex.generated
    A hw/i386/ssdt-tpm2.dsl
    A hw/i386/ssdt-tpm2.hex.generated
    M hw/input/virtio-input.c
    M hw/net/vhost_net.c
    M hw/net/virtio-net.c
    M hw/pci/msi.c
    M hw/pci/msix.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/s390-virtio-bus.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h
    M hw/scsi/vhost-scsi.c
    M hw/scsi/virtio-scsi.c
    M hw/tpm/Makefile.objs
    M hw/tpm/tpm_int.h
    M hw/tpm/tpm_passthrough.c
    M hw/tpm/tpm_tis.c
    M hw/tpm/tpm_tis.h
    A hw/tpm/tpm_util.c
    A hw/tpm/tpm_util.h
    M hw/virtio/vhost-user.c
    M hw/virtio/virtio-balloon.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-mmio.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M hw/virtio/virtio-rng.c
    M hw/virtio/virtio.c
    M include/exec/memattrs.h
    M include/hw/acpi/acpi-defs.h
    M include/hw/acpi/aml-build.h
    M include/hw/acpi/tpm.h
    M include/hw/boards.h
    M include/hw/compat.h
    M include/hw/i386/pc.h
    M include/hw/pci/msi.h
    M include/hw/qdev-properties.h
    M include/hw/s390x/s390_flic.h
    M include/hw/virtio/virtio-bus.h
    M include/hw/virtio/virtio.h
    M include/sysemu/tpm.h
    M include/sysemu/tpm_backend.h
    M net/vhost-user.c
    M qapi-schema.json
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc, pci, tpm, virtio, vhost enhancements and fixes

A bunch of cleanups and fixes all over the place,
enhancements in TPM, virtio and vhost.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon Jun  1 13:19:48 2015 BST 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: (60 commits)
  vhost-user: add multi queue support
  virtio: make features 64bit wide
  qdev: add 64bit properties
  virtio-mmio: ioeventfd support
  hw/acpi/aml-build: Fix memory leak
  acpi: add aml_while() term
  acpi: add aml_increment() term
  acpi: add aml_shiftright() term
  acpi: add aml_shiftleft() term
  acpi: add aml_index() term
  acpi: add aml_lless() term
  acpi: add aml_add() term
  TPM2 ACPI table support
  tpm: Probe for connected TPM 1.2 or TPM 2
  Extend TPM TIS interface to support TPM 2
  Add stream ID to MSI write
  acpi: Simplify printing to dynamic string
  i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted
  i386/pc_q35: don't insist on board FDC if there's no default floppy
  i386/pc: '-drive if=floppy' should imply a board-default FDC
  ...

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


Compare: https://github.com/qemu/qemu/compare/9657cafceb90...b821cbe274c5

reply via email to

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