[Qemu-commits] [qemu/qemu] 8aedc3: qdev: fix 64 bit properties

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8aedc369c6ae4fb4c4c6920f703b000015df3d8d
      
https://github.com/qemu/qemu/commit/8aedc369c6ae4fb4c4c6920f703b000015df3d8d
  Author: Cornelia Huck <address@hidden>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

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

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

64 bit props used 32 bit callbacks in two places, leading to broken
feature bits on virtio (example: got 0x31000000000006d4 which is
obviously bogus). Fix this.

Fixes: fdba6d96 ("qdev: add 64bit properties")
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>


  Commit: 2a6391232fa58f32469fb61d55343eff32a91083
      
https://github.com/qemu/qemu/commit/2a6391232fa58f32469fb61d55343eff32a91083
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

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

  Log Message:
  -----------
  virtio-pci: don't crash on illegal length

Some guests seem to access cfg with an illegal length value.
It's worth fixing them but debugging is easier if
qemu does not crash.

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


  Commit: 06c4670ff6d4acdc5a24e3d25748ee4a489d5869
      
https://github.com/qemu/qemu/commit/06c4670ff6d4acdc5a24e3d25748ee4a489d5869
  Author: Jason Wang <address@hidden>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

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

  Log Message:
  -----------
  Revert "virtio-net: enable virtio 1.0"

This reverts commit df91055db5c9cee93d70ca8c08d72119a240b987.

This is because:
- vhost support virtio 1.0 now
- transport code (e.g virtio-pci) set this feature when modern is
  enabled, setting this unconditionally will break disable-modern=on.

Cc: Cornelia Huck <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: 4421c6a38a37d558b8e6f82d2d54aee30350f57f
      
https://github.com/qemu/qemu/commit/4421c6a38a37d558b8e6f82d2d54aee30350f57f
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3

commit fddd179ab962f6f78a8493742e1068d6a620e059,
    "pc: Convert *_MACHINE_OPTIONS macros into functions"
broke the chaining of *_machine_options() functions on
pc-i440fx-2.3, at:

  -#define PC_I440FX_2_3_MACHINE_OPTIONS \
  -    PC_I440FX_2_4_MACHINE_OPTIONS, \
  -    .alias = NULL, \
  -    .is_default = 0
  +static void pc_i440fx_2_3_machine_options(QEMUMachine *m)
  +{
  +    pc_i440fx_machine_options(m);
  +    m->alias = NULL;
  +    m->is_default = 0;
  +}

I have replaced PC_I440FX_2_4_MACHINE_OPTIONS with a
pc_i440fx_machine_options() call, instead of calling
pc_i440fx_2_4_machine_options(). This broke the setting of default_machine_opts
and default_display on pc-i440fx-{2.0,2,1,2.2,2.3}.

Fix this by making pc_i440fx_2_3_machine_options() reuse
pc_i440fx_2_4_machine_options().

Reported-by: "Dr. David Alan Gilbert" <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>


  Commit: f3a1b5068cea303a55e2a21a97e66d057eaae638
      
https://github.com/qemu/qemu/commit/f3a1b5068cea303a55e2a21a97e66d057eaae638
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M hw/core/qdev-properties.c
    M hw/i386/pc_piix.c
    M hw/net/virtio-net.c
    M hw/virtio/virtio-pci.c
    M include/hw/qdev-properties.h

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

pc,virtio: fixes for 2.4

pc and virtio changes, bugfixes only.

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

# gpg: Signature made Mon Jul 13 13:03:38 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:
  pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3
  Revert "virtio-net: enable virtio 1.0"
  virtio-pci: don't crash on illegal length
  qdev: fix 64 bit properties

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


Compare: https://github.com/qemu/qemu/compare/6e3c0c6edbdd...f3a1b5068cea