From: Dietmar Maurer Date: Tue, 4 Dec 2012 05:33:00 +0000 (+0100) Subject: update to qemu 1.3 final X-Git-Url: https://git.proxmox.com/?p=pve-qemu-kvm.git;a=commitdiff_plain;h=efa8e5de2f56e6dc8903691bab5c9eb3c52c5708 update to qemu 1.3 final --- diff --git a/Makefile b/Makefile index 21f76ed..56d9842 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=2.2 # also update debian/changelog KVMVER=1.3 -KVMPKGREL=4 +KVMPKGREL=5 KVMPACKAGE=pve-qemu-kvm KVMDIR=qemu-kvm @@ -18,6 +18,7 @@ all: ${KVM_DEB} ${KVMSRC} download: rm -rf ${KVMDIR} ${KVMSRC} git clone git://git.qemu-project.org/qemu.git -b master ${KVMDIR} + cd ${KVMDIR}; git checkout -b local v1.3.0 tar czf ${KVMSRC} --exclude CVS --exclude .git --exclude .svn ${KVMDIR} ${KVM_DEB} kvm: ${KVMSRC} diff --git a/debian/changelog b/debian/changelog index 2c683b5..f99d098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ +pve-qemu-kvm (1.3-5) unstable; urgency=low + + * update to qemu 1.3 final + + -- Proxmox Support Team Tue, 04 Dec 2012 06:18:16 +0100 + pve-qemu-kvm (1.3-4) unstable; urgency=low - * update to qemu 1.3 rc2 (bios update, fix lsi bug) + * update to qemu 1.3 rc2 (bios update, fix lsi bug) * rm stream-fix-ratelimit_set_speed.patch (upstream) diff --git a/debian/patches/0003-add-backup-related-monitor-commands.patch b/debian/patches/0003-add-backup-related-monitor-commands.patch index 3d4724f..83c6921 100644 --- a/debian/patches/0003-add-backup-related-monitor-commands.patch +++ b/debian/patches/0003-add-backup-related-monitor-commands.patch @@ -1,4 +1,4 @@ -From 6e030cd398065d17ab01fe7b2a3e655c5e5f19eb Mon Sep 17 00:00:00 2001 +From b58dfd87e2ff6552caab3e8b67966ab6b8c63080 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Nov 2012 11:27:56 +0100 Subject: [PATCH v3 3/6] add backup related monitor commands @@ -45,7 +45,7 @@ index e1f0290..ae4aa8c 100644 + #endif /* QEMU_BACKUP_H */ diff --git a/blockdev.c b/blockdev.c -index e73fd6e..c635d21 100644 +index e73fd6e..9e85ffe 100644 --- a/blockdev.c +++ b/blockdev.c @@ -20,6 +20,7 @@ @@ -326,7 +326,7 @@ index e73fd6e..c635d21 100644 + } + + const char *basename = g_path_get_basename(config_filename); -+ if (driver->register_config_cb(writer, basename, cdata, clen) <= 0) { ++ if (driver->register_config_cb(writer, basename, cdata, clen) < 0) { + error_setg(errp, "register_config failed"); + g_free(cdata); + goto err; diff --git a/debian/patches/0004-introduce-new-vma-archive-format.patch b/debian/patches/0004-introduce-new-vma-archive-format.patch index 477c43a..6c416c1 100644 --- a/debian/patches/0004-introduce-new-vma-archive-format.patch +++ b/debian/patches/0004-introduce-new-vma-archive-format.patch @@ -1,4 +1,4 @@ -From 07c102f539d0ee90afbd695cdb1a8955a141d8c1 Mon Sep 17 00:00:00 2001 +From 12a179d66c3ead14c821dbc570f2448c8c8b355f Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 13 Nov 2012 11:11:38 +0100 Subject: [PATCH v3 4/6] introduce new vma archive format @@ -12,10 +12,10 @@ Signed-off-by: Dietmar Maurer blockdev.c | 6 +- docs/specs/vma_spec.txt | 24 ++ vma-reader.c | 772 ++++++++++++++++++++++++++++++++++++++++ - vma-writer.c | 900 +++++++++++++++++++++++++++++++++++++++++++++++ - vma.c | 550 +++++++++++++++++++++++++++++ + vma-writer.c | 907 +++++++++++++++++++++++++++++++++++++++++++++++ + vma.c | 550 ++++++++++++++++++++++++++++ vma.h | 145 ++++++++ - 8 files changed, 2398 insertions(+), 4 deletions(-) + 8 files changed, 2405 insertions(+), 4 deletions(-) create mode 100644 docs/specs/vma_spec.txt create mode 100644 vma-reader.c create mode 100644 vma-writer.c @@ -57,7 +57,7 @@ index cb46be5..b5732e2 100644 block-obj-$(CONFIG_POSIX) += event_notifier-posix.o aio-posix.o block-obj-$(CONFIG_WIN32) += event_notifier-win32.o aio-win32.o diff --git a/blockdev.c b/blockdev.c -index c635d21..f424933 100644 +index 9e85ffe..139e350 100644 --- a/blockdev.c +++ b/blockdev.c @@ -21,6 +21,7 @@ @@ -892,10 +892,10 @@ index 0000000..154c96b + diff --git a/vma-writer.c b/vma-writer.c new file mode 100644 -index 0000000..02d4447 +index 0000000..917c77f --- /dev/null +++ b/vma-writer.c -@@ -0,0 +1,900 @@ +@@ -0,0 +1,907 @@ +/* + * VMA: Virtual Machine Archive + * @@ -1282,7 +1282,14 @@ index 0000000..02d4447 + socket_set_nonblock(vmaw->fd); + + } else { -+ vmaw->fd = open(filename, O_NONBLOCK|O_WRONLY|O_CREAT|O_EXCL, 0644); ++ struct stat st; ++ int oflags; ++ if ((stat(filename, &st) == 0) && S_ISFIFO(st.st_mode)) { ++ oflags = O_NONBLOCK|O_WRONLY; ++ } else { ++ oflags = O_NONBLOCK|O_WRONLY|O_CREAT|O_EXCL; ++ } ++ vmaw->fd = open(filename, oflags, 0644); + if (vmaw->fd < 0) { + error_setg(errp, "can't open file %s - %s\n", filename, + strerror(errno)); diff --git a/debian/patches/0005-add-regression-tests-for-backup.patch b/debian/patches/0005-add-regression-tests-for-backup.patch index 341a815..d0bcd01 100644 --- a/debian/patches/0005-add-regression-tests-for-backup.patch +++ b/debian/patches/0005-add-regression-tests-for-backup.patch @@ -1,4 +1,4 @@ -From 2a7c5bdf32295a97fdfe63783fcdc846c92e50a9 Mon Sep 17 00:00:00 2001 +From e6cbe1cf67c6fd7b6fdce689c17cb40a4c644e13 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 14 Nov 2012 09:57:04 +0100 Subject: [PATCH v3 5/6] add regression tests for backup diff --git a/debian/patches/0006-add-vm-state-to-backups.patch b/debian/patches/0006-add-vm-state-to-backups.patch index 53923dc..cb5e137 100644 --- a/debian/patches/0006-add-vm-state-to-backups.patch +++ b/debian/patches/0006-add-vm-state-to-backups.patch @@ -1,4 +1,4 @@ -From 8c867119798abdd8f16b6fdf738aa0682cb4e713 Mon Sep 17 00:00:00 2001 +From 06eb6208bcc65bce57f31bd33ff5256567f49368 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 29 Nov 2012 10:46:49 +0100 Subject: [PATCH v3 6/6] add vm state to backups @@ -12,7 +12,7 @@ Signed-off-by: Dietmar Maurer 3 files changed, 199 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c -index f424933..f3d8ac6 100644 +index 139e350..087af8c 100644 --- a/blockdev.c +++ b/blockdev.c @@ -22,6 +22,8 @@ diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz index 87748ef..1ac3bc4 100644 Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ