mbox

[PULL,00/15] virtio, pc: fixes, features

Message ID 1488435591-17882-1-git-send-email-mst@redhat.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

Message

Michael S. Tsirkin March 2, 2017, 6:20 a.m. UTC
The following changes since commit 1e0addb682c3c552fd97480037d4f8ff18e2b87e:

  Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170228-tag' into staging (2017-03-01 20:33:47 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

for you to fetch changes up to 077dd74239a99f6c1e77c5c1aa24cfc7f58cd20c:

  hw/pxb-pcie: fix PCI Express hotplug support (2017-03-02 07:31:26 +0200)

----------------------------------------------------------------
virtio, pc: fixes, features

virtio support for region caches broke a bunch of stuff - fixing most of
it though it's not ideal.  Still pondering the right way to fix it.
New: VM gen ID and hotplug for PXB.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Ben Warren (6):
      linker-loader: Add new 'write pointer' command
      docs: VM Generation ID device description
      ACPI: Add vmgenid blob storage to the build tables
      ACPI: Add Virtual Machine Generation ID support
      tests: Move reusable ACPI code into a utility file
      MAINTAINERS: Add VM Generation ID entries

Cornelia Huck (1):
      virtio: guard vring access when setting notification

Igor Mammedov (1):
      qmp/hmp: add query-vm-generation-id and 'info vm-generation-id' commands

Jason Wang (1):
      virtio: unbreak virtio-pci with IOMMU after caching ring translations

Marcel Apfelbaum (1):
      hw/pxb-pcie: fix PCI Express hotplug support

Michael S. Tsirkin (2):
      acpi: simplify _OSC
      tests/acpi: update DSDT after last patch

Paolo Bonzini (1):
      virtio: check for vring setup in virtio_queue_empty

Stefan Hajnoczi (2):
      virtio: invalidate memory in vring_set_avail_event()
      virtio: add missing region cache init in virtio_load()

 docs/specs/vmgenid.txt               | 245 +++++++++++++++++++++++++++++++++
 default-configs/i386-softmmu.mak     |   1 +
 default-configs/x86_64-softmmu.mak   |   1 +
 qapi-schema.json                     |  20 +++
 hmp.h                                |   1 +
 include/hw/acpi/acpi_dev_interface.h |   1 +
 include/hw/acpi/aml-build.h          |   1 +
 include/hw/acpi/bios-linker-loader.h |   7 +
 include/hw/acpi/vmgenid.h            |  35 +++++
 tests/acpi-utils.h                   |  94 +++++++++++++
 hmp.c                                |   9 ++
 hw/acpi/aml-build.c                  |   2 +
 hw/acpi/bios-linker-loader.c         |  66 ++++++++-
 hw/acpi/vmgenid.c                    | 258 +++++++++++++++++++++++++++++++++++
 hw/i386/acpi-build.c                 |  24 +++-
 hw/virtio/virtio-pci.c               |   2 +-
 hw/virtio/virtio.c                   |  32 ++++-
 stubs/vmgenid.c                      |   9 ++
 tests/acpi-utils.c                   |  65 +++++++++
 tests/bios-tables-test.c             | 132 ++----------------
 MAINTAINERS                          |  11 ++
 dtc                                  |   2 +-
 hmp-commands-info.hx                 |  14 ++
 hw/acpi/Makefile.objs                |   1 +
 stubs/Makefile.objs                  |   1 +
 tests/Makefile.include               |   2 +-
 tests/acpi-test-data/q35/DSDT        | Bin 7860 -> 7824 bytes
 tests/acpi-test-data/q35/DSDT.bridge | Bin 7877 -> 7841 bytes
 tests/acpi-test-data/q35/DSDT.cphp   | Bin 8323 -> 8287 bytes
 tests/acpi-test-data/q35/DSDT.ipmibt | Bin 7935 -> 7899 bytes
 tests/acpi-test-data/q35/DSDT.memhp  | Bin 9225 -> 9189 bytes
 31 files changed, 902 insertions(+), 134 deletions(-)
 create mode 100644 docs/specs/vmgenid.txt
 create mode 100644 include/hw/acpi/vmgenid.h
 create mode 100644 tests/acpi-utils.h
 create mode 100644 hw/acpi/vmgenid.c
 create mode 100644 stubs/vmgenid.c
 create mode 100644 tests/acpi-utils.c

Comments

Michael S. Tsirkin March 2, 2017, 6:20 a.m. UTC | #1
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/q35/DSDT        | Bin 7860 -> 7824 bytes
 tests/acpi-test-data/q35/DSDT.bridge | Bin 7877 -> 7841 bytes
 tests/acpi-test-data/q35/DSDT.cphp   | Bin 8323 -> 8287 bytes
 tests/acpi-test-data/q35/DSDT.ipmibt | Bin 7935 -> 7899 bytes
 tests/acpi-test-data/q35/DSDT.memhp  | Bin 9225 -> 9189 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index d11567c3dc220894911166681ee7303fadfe04e8..0dccad439b8e8e00b403c8d290a89630c4329d45 100644
GIT binary patch
delta 106
zcmdmDJHeLACD<iof*b<_W9>w)elBmW_+Y2_=q6{biHlW)M10ue{ezuZy0RIZUBV3)
y__0oWs-<U~P@TXfo3KD&(&S9WT95=62UuEo(qtfQoB$CM0ErbOYz}3NmjwWRx*t3M

delta 142
zcmbPWyTz8vCD<ioiyQ+3<Bf@2{apS$@xe~<(M|3=6Bnz<aRi431Tb(ohXnaBh`4aZ
z`v*I-bY(L*yM!AqaATi%Q_IZ=q@n;QU<^`J4I;Q?LF58~Ns}`fYe7o6IKUdjCQXK^
Sg9r<NgbP55Hybj>%K`v}Ln$x-

diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
index 412a6e910404dca9b5d6e6c2d027b9e10ccc2a84..8cd66c3b3143297a5262480e46be9ee811a6291f 100644
GIT binary patch
delta 106
zcmX?VyU>=)CD<iop&SDPqwGYkelBmW_+Y2_=q6{biHlW)M10ue{ezuZy0RIZUBV3)
y__0oWs-<U~P@TXfo3KD&(&S9WT95=62UuEo(qtfQoB$CM0ErbOYz}2CkOcs6zaJm~

delta 142
zcmZ2zd(@W8CD<k8s2l?WW5q<SelCBW_+Y2_=q7ibiHlX_ID$h10vI@)LxOx5L|i!I
z{ezuZy0RIZUBV3)xUo;XspVz_Qc(aDFa{~A1`%AcAaa4gq{*3#wIHQj9AFJ%lP1H|
RL4*ZB!UZ73n++KYWC3vWDHH$z

diff --git a/tests/acpi-test-data/q35/DSDT.cphp b/tests/acpi-test-data/q35/DSDT.cphp
index 79902d0d30f02d74594cb87b14460ea02764d460..3c28a17a69db15dc92c825c1502a7f86ab975c0d 100644
GIT binary patch
delta 106
zcmZp6yzju}66_KZufV{-_-!IrKbJRGe6Uk|bdxjJ#KkH?B0lW#{=v>HUD*uIF5!j?
y{8%SG)zULgs7~OLO;{i>X>ulGEl7fk11v2(X)=&DPJoCBfW!(CHit6m$pZkUtRH*;

delta 142
zcmccb(Co<N66_MvtiZs)7&wuupUa;oKG-Qfy2+hq;$js!j^NOM00s`{kRTrh5f{#Q
z|6pg9u51QpmvF-cZtN3pYPlJKR1^ROj6sU3K?Ij9h+H5rX>ulGEl4RB2UvsHq{%RK
R5Mcq3Z~;j1W<y3jc>q1nC~yD(

diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt b/tests/acpi-test-data/q35/DSDT.ipmibt
index b658329c5b8e7eba009ad96f7cd26674b5a2c861..3ceb876127725f199e3df903bc71e4023e2fa225 100644
GIT binary patch
delta 106
zcmexwd)t=FCD<k8wj2Wk<D!XN{aoH$@xe~<(M`@=6BnxpiTJR``v*I-bY(L*yM!Aq
y@ME3$R7=k|p*n#}HerFlq{*3#wIB&D4zRTFq{%?qH~}Ii01_)m*c{5ZN)`a-jUbHx

delta 142
zcmca@``?z!CD<k8zZ?St<KKx~{apS$@xe~<(M|3=6Bnz<aRi431Tb(ohXnaBh`4aZ
z`v*I-bY(L*yM!AqaATi%Q_IZ=q@n;QU<^`J4I;Q?LF58~Ns}`fYe7o6IKUdjCQXK^
Sg9r<NgbP55Hybjpk_7+}{VIU~

diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/acpi-test-data/q35/DSDT.memhp
index e46c1fb5a21b8b45a4db5955989941875169a46d..bdbefd47a5398ed96498b77bfb6a74f7ea638db1 100644
GIT binary patch
delta 106
zcmeD5c<RpO66_N4RGEQ+v2h|-KbJRGe6Uk|bdxjJ#KkH?B0lW#{=v>HUD*uIF5!j?
y{8%SG)zULgs7~OLO;{i>X>ulGEl7fk11v2(X)=&DPJoCBfW!(CHit59Q33$GF(5Ml

delta 142
zcmaFr-s!>R66_Mfslvd(czYsOKbJpGe6Uk|bdx*J#KkId9KoRh0Sp|@AwfP2A}*Zq
z{=v>HUD*uIF5!j?+}J1H)N(TdsVD#n7=sj5g9t8J5V=5L(&S9WT98sM4zLEXNt0pf
RAi@G5;R2B2&4!FylmJxFDJK8`
Peter Maydell March 2, 2017, 8:34 a.m. UTC | #2
On 2 March 2017 at 06:20, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 1e0addb682c3c552fd97480037d4f8ff18e2b87e:
>
>   Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170228-tag' into staging (2017-03-01 20:33:47 +0000)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 077dd74239a99f6c1e77c5c1aa24cfc7f58cd20c:
>
>   hw/pxb-pcie: fix PCI Express hotplug support (2017-03-02 07:31:26 +0200)
>
> ----------------------------------------------------------------
> virtio, pc: fixes, features
>
> virtio support for region caches broke a bunch of stuff - fixing most of
> it though it's not ideal.  Still pondering the right way to fix it.
> New: VM gen ID and hotplug for PXB.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

This is now well past the softfreeze deadline; do you have
a justification for putting new features in during freeze?

thanks
-- PMM
Michael S. Tsirkin March 2, 2017, 3:29 p.m. UTC | #3
On Thu, Mar 02, 2017 at 08:34:42AM +0000, Peter Maydell wrote:
> On 2 March 2017 at 06:20, Michael S. Tsirkin <mst@redhat.com> wrote:
> > The following changes since commit 1e0addb682c3c552fd97480037d4f8ff18e2b87e:
> >
> >   Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170228-tag' into staging (2017-03-01 20:33:47 +0000)
> >
> > are available in the git repository at:
> >
> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> >
> > for you to fetch changes up to 077dd74239a99f6c1e77c5c1aa24cfc7f58cd20c:
> >
> >   hw/pxb-pcie: fix PCI Express hotplug support (2017-03-02 07:31:26 +0200)
> >
> > ----------------------------------------------------------------
> > virtio, pc: fixes, features
> >
> > virtio support for region caches broke a bunch of stuff - fixing most of
> > it though it's not ideal.  Still pondering the right way to fix it.
> > New: VM gen ID and hotplug for PXB.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> This is now well past the softfreeze deadline; do you have
> a justification for putting new features in during freeze?
> 
> thanks
> -- PMM

pxb hotplug support is more a bugfix than a feature - we just forgot to
include the acpi bits, and the patches are very small.  vm gen id has
been in my tree for a long time and bios bits have been merged. If we
keep it out of this release there's more of a chance they will bitrot
which would be a mess.
Peter Maydell March 3, 2017, 12:42 p.m. UTC | #4
On 2 March 2017 at 06:20, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 1e0addb682c3c552fd97480037d4f8ff18e2b87e:
>
>   Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170228-tag' into staging (2017-03-01 20:33:47 +0000)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 077dd74239a99f6c1e77c5c1aa24cfc7f58cd20c:
>
>   hw/pxb-pcie: fix PCI Express hotplug support (2017-03-02 07:31:26 +0200)
>
> ----------------------------------------------------------------
> virtio, pc: fixes, features
>
> virtio support for region caches broke a bunch of stuff - fixing most of
> it though it's not ideal.  Still pondering the right way to fix it.
> New: VM gen ID and hotplug for PXB.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>

Applied, thanks.

-- PMM
Peter Maydell March 3, 2017, 12:44 p.m. UTC | #5
On 2 March 2017 at 06:20, Michael S. Tsirkin <mst@redhat.com> wrote:
>  dtc                                  |   2 +-

I just noticed this erroneous submodule update in here, unfortunately
after I pushed it to master :-(

I'll fix up the tree...

thanks
-- PMM
Michael S. Tsirkin March 3, 2017, 7:10 p.m. UTC | #6
On Fri, Mar 03, 2017 at 12:44:59PM +0000, Peter Maydell wrote:
> On 2 March 2017 at 06:20, Michael S. Tsirkin <mst@redhat.com> wrote:
> >  dtc                                  |   2 +-
> 
> I just noticed this erroneous submodule update in here, unfortunately
> after I pushed it to master :-(
> 
> I'll fix up the tree...
> 
> thanks
> -- PMM

Ouch. submodules are a pain :(
Let me know if you need me to rebase. Sorry.