Rebase to qemu 2.7.0-rc3

This commit is contained in:
Cole Robinson 2016-08-19 09:20:00 -04:00
parent d52607ebe6
commit 94ddf1cc6a
3 changed files with 6 additions and 18 deletions

View File

@ -1,12 +0,0 @@
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index e4f424a..20d1cd6 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -19,6 +19,7 @@
#include "ui/console.h"
#include "hw/virtio/virtio.h"
#include "hw/pci/pci.h"
+#include "qemu/log.h"
#include "standard-headers/linux/virtio_gpu.h"
#define TYPE_VIRTIO_GPU "virtio-gpu-device"

View File

@ -50,7 +50,7 @@
%undefine _hardened_build
# Release candidate version tracking
%global rcver rc2
%global rcver rc3
%if 0%{?rcver:1}
%global rcrel .%{rcver}
%global rcstr -%{rcver}
@ -60,7 +60,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 2.7.0
Release: 0.1%{?rcrel}%{?dist}
Release: 0.2%{?rcrel}%{?dist}
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
Group: Development/Tools
@ -92,9 +92,6 @@ Source20: kvm.conf
# /etc/sysctl.d/50-kvm-s390x.conf
Source21: 50-kvm-s390x.conf
# Build fix, posted upstream
Patch0001: for-2.7-virtio-gpu-fix-missing-log.h-include-file.patch
# documentation deps
BuildRequires: texi2html
BuildRequires: texinfo
@ -1545,6 +1542,9 @@ getent passwd qemu >/dev/null || \
%changelog
* Fri Aug 19 2016 Cole Robinson <crobinso@redhat.com> - 2:2.7.0-0.2.rc3
- Rebase to qemu 2.7.0-rc3
* Wed Aug 03 2016 Cole Robinson <crobinso@redhat.com> - 2:2.7.0-0.1.rc2
- Rebase to qemu 2.7.0-rc2

View File

@ -1 +1 @@
25b45e67dde60ebfc0bdfae4f3c7e26b qemu-2.7.0-rc2.tar.bz2
c6386f929ac28f442e8b8bb4b63d809c qemu-2.7.0-rc3.tar.bz2