[pve-devel] [PATCH kvm 1/2] buildsys: turned git-revert into patch; using --depth=1

Wolfgang Bumiller w.bumiller at proxmox.com
Mon Jul 4 15:52:57 CEST 2016


Makes 'make download' much less of a waste of time, space
and traffic.
---
Note: applied together with Thomas L.'s qemu 2.6 patches

 Makefile                                           |  5 +---
 ...ert-target-i386-disable-LINT0-after-reset.patch | 34 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch

diff --git a/Makefile b/Makefile
index 097403d..7bab7ab 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,7 @@ all: ${DEBS}
 .PHONY: download
 download:
 	rm -rf ${KVMDIR} ${KVMSRC}
-	#git clone git://git.qemu-project.org/qemu.git -b stable-2.4 ${KVMDIR} 
-	git clone git://git.qemu-project.org/qemu.git ${KVMDIR}
-	# see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
-	cd ${KVMDIR}; git checkout v2.6.0; git revert --no-edit b8eb5512fd8a115f164edbbe897cdf8884920ccb
+	git clone --depth=1 git://git.qemu-project.org/qemu.git -b v2.6.0 ${KVMDIR}
 	tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR}
 
 ${DEBS} kvm: ${KVMSRC}
diff --git a/debian/patches/extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch b/debian/patches/extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch
new file mode 100644
index 0000000..5c0533f
--- /dev/null
+++ b/debian/patches/extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch
@@ -0,0 +1,34 @@
+From 3f89d6f1f3ba9b316e3f17c78c8c6f06a8f9c974 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller at proxmox.com>
+Date: Mon, 4 Jul 2016 15:02:26 +0200
+Subject: [PATCH] Revert "target-i386: disable LINT0 after reset"
+
+This reverts commit b8eb5512fd8a115f164edbbe897cdf8884920ccb.
+---
+see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
+ hw/intc/apic_common.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
+index ad959c4..0264a88 100644
+--- a/hw/intc/apic_common.c
++++ b/hw/intc/apic_common.c
+@@ -242,6 +242,15 @@ static void apic_reset_common(DeviceState *dev)
+     info->vapic_base_update(s);
+ 
+     apic_init_reset(dev);
++
++    if (bsp) {
++        /*
++         * LINT0 delivery mode on CPU #0 is set to ExtInt at initialization
++         * time typically by BIOS, so PIC interrupt can be delivered to the
++         * processor when local APIC is enabled.
++         */
++        s->lvt[APIC_LVT_LINT0] = 0x700;
++    }
+ }
+ 
+ /* This function is only used for old state version 1 and 2 */
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 1ebdb64..3614309 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,6 +51,8 @@ pve/0050-fix-possible-unitialised-return-value.patch
 pve/0051-net-NET_CLIENT_OPTIONS_KIND_MAX-changed.patch
 pve/0052-vnc-refactor-to-QIOChannelSocket.patch
 pve/0053-vma-use-BlockBackend-on-extract.patch
+#see https://bugs.launchpad.net/qemu/+bug/1488363?comments=all
+extra/0001-Revert-target-i386-disable-LINT0-after-reset.patch
 extra/0001-i386-kvmvapic-initialise-imm32-variable.patch
 extra/0001-vga-add-sr_vbe-register-set.patch
 extra/CVE-2016-4952-scsi-pvscsi-check-command-descriptor-ring-buffer-siz.patch
-- 
2.1.4




More information about the pve-devel mailing list