qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 5ec7d0: xen: fix ram init regression


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5ec7d0: xen: fix ram init regression
Date: Tue, 05 Jul 2016 10:00:04 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5ec7d09818881b87052c41259e5cb781683977d2
      
https://github.com/qemu/qemu/commit/5ec7d09818881b87052c41259e5cb781683977d2
  Author: Gerd Hoffmann <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M xen-hvm.c

  Log Message:
  -----------
  xen: fix ram init regression

Commit "8156d48 pc: allow raising low memory via max-ram-below-4g
option" causes a regression on xen, because it uses a different
memory split.

This patch initializes max-ram-below-4g to zero and leaves the
initialization to the memory initialization functions.  That way
they can pick different default values (max-ram-below-4g is zero
still) or use the user supplied value (max-ram-below-4g is non-zero).

Also skip the whole ram split calculation on Xen.  xen_ram_init()
does its own split calculation anyway so it is superfluous, also
this way xen_ram_init can actually see whenever max-ram-below-4g
is zero or not.

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


  Commit: 1b04cc801adff9ddf5aca9afe0e19df54290ca2c
      
https://github.com/qemu/qemu/commit/1b04cc801adff9ddf5aca9afe0e19df54290ca2c
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/ppc/mac_newworld.c

  Log Message:
  -----------
  hw/ppc: realize the PCI root bus as part of mac99 init

Mac99's PCI root bus is not part of a host bridge,
realize it manually.

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


  Commit: b86eacb804bdb92acc48cab8cd2a465714a829ab
      
https://github.com/qemu/qemu/commit/b86eacb804bdb92acc48cab8cd2a465714a829ab
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/pci/pci.c
    M include/hw/pci/pci_bus.h
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  hw/pci: delay bus_master_enable_region initialization

Skip bus_master_enable region creation on PCI device init
in order to be sure the IOMMU device (if present) would
be created in advance. Add this memory region at machine_done time.

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


  Commit: bf8d492405feaee2c1685b3b9d5e03228ed3e47f
      
https://github.com/qemu/qemu/commit/bf8d492405feaee2c1685b3b9d5e03228ed3e47f
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/i386/pc_q35.c
    M hw/pci-bridge/pci_expander_bridge.c
    M hw/pci-host/piix.c
    M hw/pci-host/q35.c

  Log Message:
  -----------
  q35: allow dynamic sysbus

Allow adding sysbus devices with -device on Q35.

At first Q35 will support only intel-iommu to be added this way,
however the command line will support all sysbus devices.

Mark with 'cannot_instantiate_with_device_add_yet' the ones
causing immediate problems (e.g. crashes).

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


  Commit: 621d983a1f9051f4cfc3f402569b46b77d8449fc
      
https://github.com/qemu/qemu/commit/621d983a1f9051f4cfc3f402569b46b77d8449fc
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/i386/intel_iommu.c
    M hw/i386/pc_q35.c
    M hw/pci-host/q35.c

  Log Message:
  -----------
  hw/iommu: enable iommu with -device

Use the standard '-device intel-iommu' to create the IOMMU device.
The legacy '-machine,iommu=on' can still be used.

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


  Commit: 10d01f73e39100701028c7badd6ece52990cf758
      
https://github.com/qemu/qemu/commit/10d01f73e39100701028c7badd6ece52990cf758
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/core/machine.c
    M hw/pci-host/q35.c
    M include/hw/pci-host/q35.h
    M qemu-options.hx

  Log Message:
  -----------
  machine: remove iommu property

Since iommu devices can be created with '-device' there is
no need to keep iommu as machine and mch property.

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


  Commit: 97a83ec3a9d83f2e86b8b93178d8e8b64ccc7486
      
https://github.com/qemu/qemu/commit/97a83ec3a9d83f2e86b8b93178d8e8b64ccc7486
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/pci-host/piix.c

  Log Message:
  -----------
  piix: Set I440FXState member pci_info.w32 in one place

Range pci_info.w32 records the location of the PCI hole.

It's initialized to empty when QOM zeroes I440FXState.  That's a fine
value for a still unknown PCI hole.

i440fx_init() sets pci_info.w32.begin = below_4g_mem_size.  Changes
the PCI hole from empty to [below_4g_mem_size, UINT64_MAX].  That's a
bogus value.

i440fx_pcihost_initfn() sets pci_info.end = IO_APIC_DEFAULT_ADDRESS.
Since i440fx_init() ran already, this changes the PCI hole to
[below_4g_mem_size, IO_APIC_DEFAULT_ADDRESS-1].  That's the correct
value.

Setting the bounds of the PCI hole in two separate places is
confusing, and begs the question whether the bogus intermediate value
could be used by something, or what would happen if we somehow managed
to realize an i440FX device without having run the board init function
i440fx_init() first.

Avoid the confusion by setting the (constant) upper bound along with
the lower bound in i440fx_init().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 01c9742d9d5a48c55a0155875657944c2159762c
      
https://github.com/qemu/qemu/commit/01c9742d9d5a48c55a0155875657944c2159762c
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/pci-host/piix.c
    M hw/pci-host/q35.c
    M include/hw/i386/pc.h
    M include/hw/pci-host/q35.h

  Log Message:
  -----------
  pc: Eliminate PcPciInfo

PcPciInfo has two (ill-named) members: Range w32 is the PCI hole, and
w64 is the PCI64 hole.

Three users:

* I440FXState and MCHPCIState have a member PcPciInfo pci_info, but
  only pci_info.w32 is actually used.  This is confusing.  Replace by
  Range pci_hole.

* acpi_build() uses auto PcPciInfo pci_info to forward both PCI holes
  from acpi_get_pci_info() to build_dsdt().  Replace by two variables
  Range pci_hole, pci_hole64.  Rename acpi_get_pci_info() to
  acpi_get_pci_holes().

PcPciInfo is now unused; drop it.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 0830c96d70b24ee76864f4e164b164bb43f24f09
      
https://github.com/qemu/qemu/commit/0830c96d70b24ee76864f4e164b164bb43f24f09
  Author: Cornelia Huck <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

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

  Log Message:
  -----------
  virtio: revert host notifiers to old semantics

The host notifier rework tried both to unify host notifiers across
transports and plug a possible hole during host notifier
re-assignment. Unfortunately, this meant a change in semantics that
breaks vhost and iSCSI+dataplane.

As the minimal fix, keep the common host notifier code but revert
to the old semantics so that we have time to figure out the proper
fix.

Fixes: 6798e245a3 ("virtio-bus: common ioeventfd infrastructure")
Reported-by: Peter Lieven <address@hidden>
Reported-by: Jason Wang <address@hidden>
Reported-by: Marc-André Lureau <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Marc-André Lureau <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Tested-by: Jason Wang <address@hidden>
Tested-by: Peter Lieven <address@hidden>


  Commit: 62cee1a28aada2cce4b0e1fb835d8fc830aed7ac
      
https://github.com/qemu/qemu/commit/62cee1a28aada2cce4b0e1fb835d8fc830aed7ac
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio: set low features early on load

virtio migrates the low 32 feature bits twice, the first copy is there
for compatibility but ever since
019a3edbb25f1571e876f8af1ce4c55412939e5d: ("virtio: make features 64bit
wide") it's ignored on load. This is wrong since virtio_net_load tests
self announcement and guest offloads before the second copy including
high feature bits is loaded.  This means that self announcement, control
vq and guest offloads are all broken after migration.

Fix it up by loading low feature bits: somewhat ugly since high and low
bits become out of sync temporarily, but seems unavoidable for
compatibility.  The right thing to do for new features is probably to
test the host features, anyway.

Fixes: 019a3edbb25f1571e876f8af1ce4c55412939e5d
    ("virtio: make features 64bit wide")
Cc: address@hidden
Reported-by: Robin Geuze <address@hidden>
Tested-by: Robin Geuze <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6c6668232e71b7cf7ff39fa1a7abf660c40f9cea
      
https://github.com/qemu/qemu/commit/6c6668232e71b7cf7ff39fa1a7abf660c40f9cea
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

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

  Log Message:
  -----------
  Revert "virtio-net: unbreak self announcement and guest offloads after 
migration"

This reverts commit 1f8828ef573c83365b4a87a776daf8bcef1caa21.

Cc: address@hidden
Reported-by: Robin Geuze <address@hidden>
Tested-by: Robin Geuze <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5178ecd86367090a59af0e15e67cee6f673aaa08
      
https://github.com/qemu/qemu/commit/5178ecd86367090a59af0e15e67cee6f673aaa08
  Author: Cao jin <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci_register_bar: cleanup

place relevant code tegother, make the code easier to read

Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 58e19e6e7914354242a67442d0006f9e31684d1a
      
https://github.com/qemu/qemu/commit/58e19e6e7914354242a67442d0006f9e31684d1a
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M tests/test-logging.c
    M util/log.c

  Log Message:
  -----------
  log: Clean up misuse of Range for -dfilter

Range encodes an integer interval [a,b] as { begin = a, end = b + 1 },
where a \in [0,2^64-1] and b \in [1,2^64].  Thus, zero end is to be
interpreted as 2^64.

The implementation of -dfilter (commit 3514552) uses Range
differently: it encodes [a,b] as { begin = a, end = b }.  The code
works, but it contradicts the specification of Range in range.h.

Switch to the specified representation.  Since it can't represent
[0,UINT64_MAX], we have to reject that now.  Add a test for it.

While we're rejecting anyway: observe that we reject -dfilter LOB..UPB
where LOB > UPB when UPB is zero, but happily create an empty Range
when it isn't.  Reject it then, too, and add a test for it.

While there, add a positive test for the problematic upper bound
UINT64_MAX.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: a0efbf16604770b9d805bcf210ec29942321134f
      
https://github.com/qemu/qemu/commit/a0efbf16604770b9d805bcf210ec29942321134f
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/pci-host/piix.c
    M hw/pci-host/q35.c
    M hw/pci/pci.c
    M include/qemu/range.h
    M qapi/string-input-visitor.c
    M qapi/string-output-visitor.c
    M util/log.c
    M util/range.c

  Log Message:
  -----------
  range: Eliminate direct Range member access

Users of struct Range mess liberally with its members, which makes
refactoring hard.  Create a set of methods, and convert all users to
call them instead of accessing members.  The methods have carefully
worded contracts, and use assertions to check them.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6dd726a2bf1b800289d90a84d5fcb5ce7b78a8e1
      
https://github.com/qemu/qemu/commit/6dd726a2bf1b800289d90a84d5fcb5ce7b78a8e1
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M include/qemu/range.h
    M util/range.c

  Log Message:
  -----------
  range: Replace internal representation of Range

Range represents a range as follows.  Member @start is the inclusive
lower bound, member @end is the exclusive upper bound.  Zero @end is
special: if @start is also zero, the range is empty, else @end is to
be interpreted as 2^64.  No other empty ranges may occur.

The range [0,2^64-1] cannot be represented.  If you try to create it
with range_set_bounds1(), you get the empty range instead.  If you try
to create it with range_set_bounds() or range_extend(), assertions
fail.  Before range_set_bounds() existed, the open-coded creation
usually got you the empty range instead.  Open deathtrap.

Moreover, the code dealing with the janus-faced @end is too clever by
half.

Dumb this down to a more pedestrian representation: members @lob and
@upb are inclusive lower and upper bounds.  The empty range is encoded
as @lob = 1, @upb = 0.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 58eeb83cc7c445f167c951493deddf45621d66bb
      
https://github.com/qemu/qemu/commit/58eeb83cc7c445f167c951493deddf45621d66bb
  Author: Markus Armbruster <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M tests/test-logging.c
    M util/log.c

  Log Message:
  -----------
  log: Permit -dfilter 0..0xffffffffffffffff

Works fine since the previous commit fixed the underlying range data
type.  Of course it filters out nothing, but so does
0..1,2..0xffffffffffffffff, and we don't bother rejecting that either.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6b9c1dd2cd4264a5a71efd7c3a7ef81f3c0a4c5a
      
https://github.com/qemu/qemu/commit/6b9c1dd2cd4264a5a71efd7c3a7ef81f3c0a4c5a
  Author: Igor Mammedov <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  tests: acpi: add CPU hotplug testcase

Test with:

    -smp 2,cores=3,sockets=2,maxcpus=6

to capture sparse APIC ID values that default
AMD CPU has in above configuration.

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


  Commit: 600426f2df5242fe6fd32c93b150eeea40cde1fa
      
https://github.com/qemu/qemu/commit/600426f2df5242fe6fd32c93b150eeea40cde1fa
  Author: Igor Mammedov <address@hidden>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    A tests/acpi-test-data/pc/APIC.cphp
    A tests/acpi-test-data/pc/DSDT.cphp
    A tests/acpi-test-data/q35/APIC.cphp
    A tests/acpi-test-data/q35/DSDT.cphp

  Log Message:
  -----------
  tests: add APIC.cphp and DSDT.cphp blobs

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


  Commit: b2e1fffb5a9fe35bfcde0db2bf1e63c062e1d0d4
      
https://github.com/qemu/qemu/commit/b2e1fffb5a9fe35bfcde0db2bf1e63c062e1d0d4
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/vmw_pvscsi.c

  Log Message:
  -----------
  change pvscsi_init_msi() type to void

Nobody use its return value, so change the type to void.

cc: Michael S. Tsirkin <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Acked-by: Dmitry Fleytman <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 290fd20db6e0d739d92ee08f43bff8d3885cd283
      
https://github.com/qemu/qemu/commit/290fd20db6e0d739d92ee08f43bff8d3885cd283
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/usb/hcd-xhci.c

  Log Message:
  -----------
  usb xhci: change msi/msix property type

>From bit to enum OnOffAuto

cc: Gerd Hoffmann <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c0f2abff738ab83bd60da55b043a28c5ee664078
      
https://github.com/qemu/qemu/commit/c0f2abff738ab83bd60da55b043a28c5ee664078
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/audio/intel-hda.c

  Log Message:
  -----------
  intel-hda: change msi property type

>From uint32 to enum OnOffAuto.

cc: Gerd Hoffmann <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 444dd1af1cdf430a437d2c9f06192b0bc94d1e10
      
https://github.com/qemu/qemu/commit/444dd1af1cdf430a437d2c9f06192b0bc94d1e10
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/mptsas.c
    M hw/scsi/mptsas.h

  Log Message:
  -----------
  mptsas: change msi property type

>From uint32 to enum OnOffAuto, and give it a shorter name.

cc: Paolo Bonzini <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: b4b4a57fa6cfa4bf9005b212f01c31e915686813
      
https://github.com/qemu/qemu/commit/b4b4a57fa6cfa4bf9005b212f01c31e915686813
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  megasas: change msi/msix property type

>From bit to enum OnOffAuto.

cc: Hannes Reinecke <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Hannes Reinecke <address@hidden>


  Commit: 69b205bb0b9ecf65b0ded7b9219ef9a58ef322ad
      
https://github.com/qemu/qemu/commit/69b205bb0b9ecf65b0ded7b9219ef9a58ef322ad
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/pci-bridge/pci_bridge_dev.c

  Log Message:
  -----------
  pci bridge dev: change msi property type

>From bit to enum OnOffAuto.

cc: Michael S. Tsirkin <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1108b2f8a939fb5778d384149e2f1b99062a72da
      
https://github.com/qemu/qemu/commit/1108b2f8a939fb5778d384149e2f1b99062a72da
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/audio/intel-hda.c
    M hw/ide/ich.c
    M hw/net/e1000e.c
    M hw/net/vmxnet3.c
    M hw/pci-bridge/ioh3420.c
    M hw/pci-bridge/pci_bridge_dev.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci/msi.c
    M hw/scsi/megasas.c
    M hw/scsi/mptsas.c
    M hw/scsi/vmw_pvscsi.c
    M hw/usb/hcd-xhci.c
    M hw/vfio/pci.c
    M include/hw/pci/msi.h

  Log Message:
  -----------
  pci: Convert msi_init() to Error and fix callers to check it

msi_init() reports errors with error_report(), which is wrong
when it's used in realize().

Fix by converting it to Error.

Fix its callers to handle failure instead of ignoring it.

For those callers who don't handle the failure, it might happen:
when user want msi on, but he doesn't get what he want because of
msi_init fails silently.

cc: Gerd Hoffmann <address@hidden>
cc: John Snow <address@hidden>
cc: Dmitry Fleytman <address@hidden>
cc: Jason Wang <address@hidden>
cc: Michael S. Tsirkin <address@hidden>
cc: Hannes Reinecke <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Alex Williamson <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Hannes Reinecke <address@hidden>


  Commit: afea4e1410654154018587dd35c1b250ba4d8ec4
      
https://github.com/qemu/qemu/commit/afea4e1410654154018587dd35c1b250ba4d8ec4
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  megasas: remove unnecessary megasas_use_msi()

megasas overwrites user configuration when msi_init fail to flag internal msi
state, which is unsuitable. megasa_use_msi() is unnecessary, we can call
msi_uninit() directly when unrealize, even no need to call msi_enabled() first.

cc: Hannes Reinecke <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>

Acked-by: Hannes Reinecke <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 2e2aa31674444b61e79536a90d63a90572e695c8
      
https://github.com/qemu/qemu/commit/2e2aa31674444b61e79536a90d63a90572e695c8
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/mptsas.c
    M hw/scsi/mptsas.h

  Log Message:
  -----------
  mptsas: remove unnecessary internal msi state flag

internal flag msi_in_use in unnecessary, msi_uninit() could be called
directly, and msi_enabled() is enough to check device msi state.

cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Paolo Bonzini <address@hidden>
cc: Michael S. Tsirkin <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1070048eae6d1adb971af749c92ef39a3168cfb4
      
https://github.com/qemu/qemu/commit/1070048eae6d1adb971af749c92ef39a3168cfb4
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/net/vmxnet3.c

  Log Message:
  -----------
  vmxnet3: remove unnecessary internal msi state flag

Internal flag msi_used is unnecessary, it has the same effect as msi_enabled().
msi_uninit() could be called directly without risk.

cc: Paolo Bonzini <address@hidden>
cc: Dmitry Fleytman <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>

Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 66bf7d58d830e6370895e4f1bb1257d135661872
      
https://github.com/qemu/qemu/commit/66bf7d58d830e6370895e4f1bb1257d135661872
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/net/e1000e.c

  Log Message:
  -----------
  e1000e: remove unnecessary internal msi state flag

Internal big flag E1000E_USE_MSI is unnecessary, also is the helper
function: e1000e_init_msi(), e1000e_cleanup_msi(), so, remove them all.

cc: Dmitry Fleytman <address@hidden>
cc: Jason Wang <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>

Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 269fe4c3ab0cf29329317eb868f8ec90ac761b41
      
https://github.com/qemu/qemu/commit/269fe4c3ab0cf29329317eb868f8ec90ac761b41
  Author: Cao jin <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/scsi/vmw_pvscsi.c

  Log Message:
  -----------
  vmw_pvscsi: remove unnecessary internal msi state flag

Internal flag msi_used is uncesessary, msi_uninit() could be called
directly, msi_enabled() is enough to check device msi state.

But for migration compatibility, keep the field in structure.

cc: Paolo Bonzini <address@hidden>
cc: Dmitry Fleytman <address@hidden>
cc: Markus Armbruster <address@hidden>
cc: Marcel Apfelbaum <address@hidden>
cc: Michael S. Tsirkin <address@hidden>

Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 791b7d2340cfafcac9af7864343cf23504d57804
      
https://github.com/qemu/qemu/commit/791b7d2340cfafcac9af7864343cf23504d57804
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-05 (Tue, 05 Jul 2016)

  Changed paths:
    M hw/audio/intel-hda.c
    M hw/core/machine.c
    M hw/i386/acpi-build.c
    M hw/i386/intel_iommu.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ide/ich.c
    M hw/net/e1000e.c
    M hw/net/virtio-net.c
    M hw/net/vmxnet3.c
    M hw/pci-bridge/ioh3420.c
    M hw/pci-bridge/pci_bridge_dev.c
    M hw/pci-bridge/pci_expander_bridge.c
    M hw/pci-bridge/xio3130_downstream.c
    M hw/pci-bridge/xio3130_upstream.c
    M hw/pci-host/piix.c
    M hw/pci-host/q35.c
    M hw/pci/msi.c
    M hw/pci/pci.c
    M hw/ppc/mac_newworld.c
    M hw/scsi/megasas.c
    M hw/scsi/mptsas.c
    M hw/scsi/mptsas.h
    M hw/scsi/vmw_pvscsi.c
    M hw/usb/hcd-xhci.c
    M hw/vfio/pci.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio.c
    M include/hw/i386/pc.h
    M include/hw/pci-host/q35.h
    M include/hw/pci/msi.h
    M include/hw/pci/pci_bus.h
    M include/qemu/range.h
    M include/sysemu/sysemu.h
    M qapi/string-input-visitor.c
    M qapi/string-output-visitor.c
    M qemu-options.hx
    A tests/acpi-test-data/pc/APIC.cphp
    A tests/acpi-test-data/pc/DSDT.cphp
    A tests/acpi-test-data/q35/APIC.cphp
    A tests/acpi-test-data/q35/DSDT.cphp
    M tests/bios-tables-test.c
    M tests/test-logging.c
    M util/log.c
    M util/range.c
    M vl.c
    M xen-hvm.c

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

pc, pci, virtio: new features, cleanups, fixes

iommus can not be added with -device.
cleanups and fixes all over the place

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

# gpg: Signature made Tue 05 Jul 2016 11:18:32 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# 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: (30 commits)
  vmw_pvscsi: remove unnecessary internal msi state flag
  e1000e: remove unnecessary internal msi state flag
  vmxnet3: remove unnecessary internal msi state flag
  mptsas: remove unnecessary internal msi state flag
  megasas: remove unnecessary megasas_use_msi()
  pci: Convert msi_init() to Error and fix callers to check it
  pci bridge dev: change msi property type
  megasas: change msi/msix property type
  mptsas: change msi property type
  intel-hda: change msi property type
  usb xhci: change msi/msix property type
  change pvscsi_init_msi() type to void
  tests: add APIC.cphp and DSDT.cphp blobs
  tests: acpi: add CPU hotplug testcase
  log: Permit -dfilter 0..0xffffffffffffffff
  range: Replace internal representation of Range
  range: Eliminate direct Range member access
  log: Clean up misuse of Range for -dfilter
  pci_register_bar: cleanup
  Revert "virtio-net: unbreak self announcement and guest offloads after 
migration"
  ...

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


Compare: https://github.com/qemu/qemu/compare/60a0f1af07d6...791b7d2340cf

reply via email to

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