qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 92fd45: Revert "Revert "globals: Allow global


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 92fd45: Revert "Revert "globals: Allow global properties t...
Date: Tue, 30 Jul 2019 02:44:11 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 92fd453c6717acbeafcbbac39084a6f1c9ac6827
      
https://github.com/qemu/qemu/commit/92fd453c6717acbeafcbbac39084a6f1c9ac6827
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

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

  Log Message:
  -----------
  Revert "Revert "globals: Allow global properties to be optional""

This reverts commit 8fa70dbd8bb478d9483c1da3e9976a2d86b3f9a0.

Because we're about to revert it's neighbour and thus uses an optional
again.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: dd56040d297a0c530e204e9f459b256e3ddd7e8f
      
https://github.com/qemu/qemu/commit/dd56040d297a0c530e204e9f459b256e3ddd7e8f
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M hw/core/machine.c
    M hw/display/virtio-gpu-pci.c
    M hw/display/virtio-vga.c
    M hw/virtio/virtio-crypto-pci.c
    M hw/virtio/virtio-input-pci.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h

  Log Message:
  -----------
  Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"

This reverts commit f2784eed306449c3d04a71a05ed6463b8289aedf
since that accidentally removes the PCIe capabilities from virtio
devices because virtio_pci_dc_realize is called before the new 'mode'
flag is set.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: 22235bb609c18547cf6b215bad1f9d2ec56ad371
      
https://github.com/qemu/qemu/commit/22235bb609c18547cf6b215bad1f9d2ec56ad371
  Author: Igor Mammedov <address@hidden>
  Date:   2019-07-29 (Mon, 29 Jul 2019)

  Changed paths:
    M hw/mem/pc-dimm.c

  Log Message:
  -----------
  pc-dimm: fix crash when invalid slot number is used

QEMU will crash with:
  Segmentation fault (core dumped)
when negative slot number is used, ex:
  qemu-system-x86_64 -m 1G,maxmem=20G,slots=256 \
      -object memory-backend-ram,id=mem1,size=1G \
      -device pc-dimm,id=dimm1,memdev=mem1,slot=-2

fix it by checking that slot number is within valid range.

Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Signed-off-by: Igor Mammedov &lt;<a href="mailto:address@hidden"; 
target="_blank">address@hidden</a>&gt;<br></blockquote><div><br></div><div>Reviewed-by:
 Li Qiang &lt;<a 
href="mailto:address@hidden";>address@hidden</a>&gt;<br></div><div> 
</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Reviewed-by: Pankaj Gupta <address@hidden>


  Commit: ee9545ed1543020fba52fa5fb8f2b71c63e5389f
      
https://github.com/qemu/qemu/commit/ee9545ed1543020fba52fa5fb8f2b71c63e5389f
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-30 (Tue, 30 Jul 2019)

  Changed paths:
    M hw/core/machine.c
    M hw/display/virtio-gpu-pci.c
    M hw/display/virtio-vga.c
    M hw/mem/pc-dimm.c
    M hw/virtio/virtio-crypto-pci.c
    M hw/virtio/virtio-input-pci.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M include/hw/qdev-core.h
    M qom/object.c

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

virtio, pc: fixes

A couple of last minute bugfixes.

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

# gpg: Signature made Mon 29 Jul 2019 22:13:22 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  pc-dimm: fix crash when invalid slot number is used
  Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs"
  Revert "Revert "globals: Allow global properties to be optional""

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


Compare: https://github.com/qemu/qemu/compare/34e2746bca22...ee9545ed1543



reply via email to

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