On Wed, 4 Mar 2015 23:32:36 +0900 Peter Maydell <peter.mayd...@linaro.org> wrote:
> On 4 March 2015 at 02:07, Michael S. Tsirkin <m...@redhat.com> wrote: > > As previously, only sending incremental patches > > added since v3. > > This is an update of the previous pull request. > > Tree was not rebased so you can do both pulls if > > ou like. > > > > The following changes since commit 11d39a131020cc5c54ff9bc86d3259f7d32bf849: > > > > Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150218' > > into staging (2015-02-26 09:08:54 +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 24f938a682d934b133863eb421aac33592f7a09e: > > > > vhost user:support vhost user nic for non msi guests (2015-03-03 17:55:36 > > +0100) > > Doesn't build: > > In file included from > /home/petmay01/linaro/qemu-for-merges/hw/i386/acpi-build.c:54:0: > ./hw/i386/q35-acpi-dsdt.hex:8185:23: error: 'q35_dsdt_applesmc_sta' > defined but not used [-Werror=unused-variable] > static unsigned short q35_dsdt_applesmc_sta[] = { > ^ > In file included from > /home/petmay01/linaro/qemu-for-merges/hw/i386/acpi-build.c:55:0: > ./hw/i386/acpi-dsdt.hex:3595:23: error: 'piix_dsdt_applesmc_sta' > defined but not used [-Werror=unused-variable] > static unsigned short piix_dsdt_applesmc_sta[] = { I've though Michael fixed not updated [q35-]acpi-dsdt.hex.generated files, is it a clean build? > ^ > cc1: all warnings being treated as errors > > -- PMM >