c/pve-qemu-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update diffs/indexes from patches

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-11-22 10:05:29 +01:00
parent 1dc952cf51
commit 917265984c
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch vendored
View File

@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c diff --git a/block/file-posix.c b/block/file-posix.c
index 4479cc7ab4..760648b78c 100644 index 2184aa980c..71aa45ce5d 100644
--- a/block/file-posix.c --- a/block/file-posix.c
+++ b/block/file-posix.c +++ b/block/file-posix.c
@@ -430,7 +430,7 @@ static QemuOptsList raw_runtime_opts = { @@ -444,7 +444,7 @@ static QemuOptsList raw_runtime_opts = {
{ {
.name = "locking", .name = "locking",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
@ -26,7 +26,7 @@ index 4479cc7ab4..760648b78c 100644
}, },
{ {
.name = "pr-manager", .name = "pr-manager",
@@ -519,7 +519,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, @@ -533,7 +533,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
s->use_lock = false; s->use_lock = false;
break; break;
case ON_OFF_AUTO_AUTO: case ON_OFF_AUTO_AUTO:

4
debian/patches/pve/0005-PVE-Config-smm_available-false.patch vendored
View File

@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 549c437050..66576b533e 100644 index d011733ff7..e20e189a5f 100644
--- a/hw/i386/pc.c --- a/hw/i386/pc.c
+++ b/hw/i386/pc.c +++ b/hw/i386/pc.c
@@ -2715,7 +2715,7 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms) @@ -2723,7 +2723,7 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms)
if (tcg_enabled() || qtest_enabled()) { if (tcg_enabled() || qtest_enabled()) {
smm_available = true; smm_available = true;
} else if (kvm_enabled()) { } else if (kvm_enabled()) {

8
debian/patches/pve/0019-PVE-backup-modify-job-api.patch vendored
View File

@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
5 files changed, 7 insertions(+), 4 deletions(-) 5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/block/backup.c b/block/backup.c diff --git a/block/backup.c b/block/backup.c
index b26c22c4b8..812783d3cb 100644 index 8761f1f9a7..30008fcc34 100644
--- a/block/backup.c --- a/block/backup.c
+++ b/block/backup.c +++ b/block/backup.c
@@ -550,6 +550,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -550,6 +550,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
@ -29,7 +29,7 @@ index b26c22c4b8..812783d3cb 100644
JobTxn *txn, Error **errp) JobTxn *txn, Error **errp)
{ {
int64_t len; int64_t len;
@@ -668,6 +669,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -675,6 +676,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL, block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
&error_abort); &error_abort);
job->len = len; job->len = len;
@ -73,10 +73,10 @@ index 4d141e9a1f..a7c97b1585 100644
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }
diff --git a/include/block/block_int.h b/include/block/block_int.h diff --git a/include/block/block_int.h b/include/block/block_int.h
index 3aa1e832a8..9f4fbad5a6 100644 index 05ee6b4866..bb2dddca83 100644
--- a/include/block/block_int.h --- a/include/block/block_int.h
+++ b/include/block/block_int.h +++ b/include/block/block_int.h
@@ -1169,6 +1169,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -1173,6 +1173,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
BlockdevOnError on_target_error, BlockdevOnError on_target_error,
int creation_flags, int creation_flags,
BlockCompletionFunc *cb, void *opaque, BlockCompletionFunc *cb, void *opaque,

16
debian/patches/pve/0027-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch vendored
View File

@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 files changed, 43 insertions(+), 21 deletions(-) 2 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c diff --git a/block/file-posix.c b/block/file-posix.c
index 760648b78c..e40386384e 100644 index 71aa45ce5d..ae1cd3980e 100644
--- a/block/file-posix.c --- a/block/file-posix.c
+++ b/block/file-posix.c +++ b/block/file-posix.c
@@ -2240,6 +2240,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) @@ -2230,6 +2230,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
int fd; int fd;
uint64_t perm, shared; uint64_t perm, shared;
int result = 0; int result = 0;
@ -24,7 +24,7 @@ index 760648b78c..e40386384e 100644
/* Validate options and set default values */ /* Validate options and set default values */
assert(options->driver == BLOCKDEV_DRIVER_FILE); assert(options->driver == BLOCKDEV_DRIVER_FILE);
@@ -2273,19 +2274,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) @@ -2263,19 +2264,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
perm = BLK_PERM_WRITE | BLK_PERM_RESIZE; perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE; shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
@ -59,7 +59,7 @@ index 760648b78c..e40386384e 100644
} }
/* Clear the file by truncating it to 0 */ /* Clear the file by truncating it to 0 */
@@ -2318,13 +2322,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp) @@ -2308,13 +2312,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
} }
out_unlock: out_unlock:
@ -82,7 +82,7 @@ index 760648b78c..e40386384e 100644
} }
out_close: out_close:
@@ -2345,6 +2351,7 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, @@ -2335,6 +2341,7 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
PreallocMode prealloc; PreallocMode prealloc;
char *buf = NULL; char *buf = NULL;
Error *local_err = NULL; Error *local_err = NULL;
@ -90,7 +90,7 @@ index 760648b78c..e40386384e 100644
/* Skip file: protocol prefix */ /* Skip file: protocol prefix */
strstart(filename, "file:", &filename); strstart(filename, "file:", &filename);
@@ -2362,6 +2369,18 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, @@ -2352,6 +2359,18 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
return -EINVAL; return -EINVAL;
} }
@ -109,7 +109,7 @@ index 760648b78c..e40386384e 100644
options = (BlockdevCreateOptions) { options = (BlockdevCreateOptions) {
.driver = BLOCKDEV_DRIVER_FILE, .driver = BLOCKDEV_DRIVER_FILE,
.u.file = { .u.file = {
@@ -2371,6 +2390,8 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts, @@ -2361,6 +2380,8 @@ static int coroutine_fn raw_co_create_opts(const char *filename, QemuOpts *opts,
.preallocation = prealloc, .preallocation = prealloc,
.has_nocow = true, .has_nocow = true,
.nocow = nocow, .nocow = nocow,
@ -118,7 +118,7 @@ index 760648b78c..e40386384e 100644
}, },
}; };
return raw_co_create(&options, errp); return raw_co_create(&options, errp);
@@ -2812,7 +2833,7 @@ static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t shared, @@ -2838,7 +2859,7 @@ static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t shared,
} }
/* Copy locks to the new fd */ /* Copy locks to the new fd */

8
debian/patches/pve/0035-backup_job_create-pass-cluster-size-for-dump.patch vendored
View File

@ -12,7 +12,7 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
4 files changed, 18 insertions(+), 6 deletions(-) 4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/block/backup.c b/block/backup.c diff --git a/block/backup.c b/block/backup.c
index 05569de5d4..a3f0d2c9a5 100644 index fdcfb0529c..2398a4d602 100644
--- a/block/backup.c --- a/block/backup.c
+++ b/block/backup.c +++ b/block/backup.c
@@ -566,6 +566,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -566,6 +566,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
@ -100,10 +100,10 @@ index 29196c18d8..a95beb823e 100644
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }
diff --git a/include/block/block_int.h b/include/block/block_int.h diff --git a/include/block/block_int.h b/include/block/block_int.h
index 73a55a7351..13dfee215d 100644 index 5a8b2e06c1..e7ca823058 100644
--- a/include/block/block_int.h --- a/include/block/block_int.h
+++ b/include/block/block_int.h +++ b/include/block/block_int.h
@@ -1156,6 +1156,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs, @@ -1160,6 +1160,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
* @on_target_error: The action to take upon error writing to the target. * @on_target_error: The action to take upon error writing to the target.
* @creation_flags: Flags that control the behavior of the Job lifetime. * @creation_flags: Flags that control the behavior of the Job lifetime.
* See @BlockJobCreateFlags * See @BlockJobCreateFlags
@ -113,7 +113,7 @@ index 73a55a7351..13dfee215d 100644
* @cb: Completion function for the job. * @cb: Completion function for the job.
* @opaque: Opaque pointer value passed to @cb. * @opaque: Opaque pointer value passed to @cb.
* @txn: Transaction that this job is part of (may be NULL). * @txn: Transaction that this job is part of (may be NULL).
@@ -1172,6 +1175,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -1176,6 +1179,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
BlockdevOnError on_target_error, BlockdevOnError on_target_error,
int creation_flags, int creation_flags,
BackupDumpFunc *dump_cb, BackupDumpFunc *dump_cb,

2
debian/patches/pve/0036-avoid-calling-dump_cb-with-NULL-data-pointer-for-sma.patch vendored
View File

@ -12,7 +12,7 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
1 file changed, 6 insertions(+), 1 deletion(-) 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c diff --git a/block/backup.c b/block/backup.c
index a3f0d2c9a5..3e99d23e98 100644 index 2398a4d602..c682c99f7a 100644
--- a/block/backup.c --- a/block/backup.c
+++ b/block/backup.c +++ b/block/backup.c
@@ -131,7 +131,12 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job, @@ -131,7 +131,12 @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,

2
debian/patches/pve/0041-PVE-backup-consider-source-cluster-size-as-well.patch vendored
View File

@ -9,7 +9,7 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
1 file changed, 2 insertions(+), 5 deletions(-) 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/block/backup.c b/block/backup.c diff --git a/block/backup.c b/block/backup.c
index 3e99d23e98..dbdc0a76ca 100644 index c682c99f7a..556367f8ba 100644
--- a/block/backup.c --- a/block/backup.c
+++ b/block/backup.c +++ b/block/backup.c
@@ -642,11 +642,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, @@ -642,11 +642,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,

4
debian/patches/pve/0044-Acquire-aio_context-before-calling-block_job_add_bdr.patch vendored
View File

@ -12,10 +12,10 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/blockjob.c b/blockjob.c diff --git a/blockjob.c b/blockjob.c
index 20b7f557da..c6067474a2 100644 index 74abb97bfd..75b9180a7f 100644
--- a/blockjob.c --- a/blockjob.c
+++ b/blockjob.c +++ b/blockjob.c
@@ -439,10 +439,20 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, @@ -448,10 +448,20 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
notifier_list_add(&job->job.on_ready, &job->ready_notifier); notifier_list_add(&job->job.on_ready, &job->ready_notifier);
notifier_list_add(&job->job.on_idle, &job->idle_notifier); notifier_list_add(&job->job.on_idle, &job->idle_notifier);