drop patch force-disabling smm
This drops debian/patches/pve/0005-PVE-Config-smm_available-false.patch (and renumbers the remaining patches) From what I could gather, this patch was originally added due to issues with old kernels. Now we have users which seem to run into issues *with* the patch. All this does is toggle an option, and it's available via a qemu CLI option anyway, so if dropping this patch causes issues for some people we can just add an option to qemu-server & UI control smm explicitly. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Cc: Alexandre Derumier <aderumier@odiso.com> Tested-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
Thomas Lamprecht
parent
611b692181
commit
277d33454f
@ -1,24 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Derumier <aderumier@odiso.com>
|
||||
Date: Mon, 6 Apr 2020 12:16:34 +0200
|
||||
Subject: [PATCH] PVE: [Config] smm_available = false
|
||||
|
||||
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
hw/i386/x86.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
|
||||
index ed796fe6ba..455ee54bae 100644
|
||||
--- a/hw/i386/x86.c
|
||||
+++ b/hw/i386/x86.c
|
||||
@@ -1145,7 +1145,7 @@ bool x86_machine_is_smm_enabled(const X86MachineState *x86ms)
|
||||
if (tcg_enabled() || qtest_enabled()) {
|
||||
smm_available = true;
|
||||
} else if (kvm_enabled()) {
|
||||
- smm_available = kvm_has_smm();
|
||||
+ smm_available = false;
|
||||
}
|
||||
|
||||
if (smm_available) {
|
||||
@ -510,7 +510,7 @@ index 0000000000..1dda8b7d8f
|
||||
+#endif /* PROXMOX_BACKUP_CLIENT_H */
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
new file mode 100644
|
||||
index 0000000000..f9fe6adb55
|
||||
index 0000000000..66868dec14
|
||||
--- /dev/null
|
||||
+++ b/pve-backup.c
|
||||
@@ -0,0 +1,959 @@
|
||||
@ -132,7 +132,7 @@ index 1dda8b7d8f..8cbf645b2c 100644
|
||||
|
||||
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index f9fe6adb55..98fd28a8f2 100644
|
||||
index 66868dec14..6cdbd40529 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -28,6 +28,8 @@
|
||||
@ -33,7 +33,7 @@ index da5043b973..f509959a32 100644
|
||||
false, NULL, false, NULL, !!devlist,
|
||||
devlist, qdict_haskey(qdict, "speed"), speed, &error);
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 98fd28a8f2..129ebd0eb4 100644
|
||||
index 6cdbd40529..7527885251 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
||||
2 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 129ebd0eb4..96e3d731da 100644
|
||||
index 7527885251..8cba8e97d3 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -1075,3 +1075,12 @@ BackupStatus *qmp_query_backup(Error **errp)
|
||||
@ -68,7 +68,7 @@ index a6a289968f..f7a211e5a4 100644
|
||||
info->zero_bytes, zero_per);
|
||||
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 96e3d731da..032ecc2007 100644
|
||||
index 8cba8e97d3..22420db26a 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -46,6 +46,7 @@ static struct PVEBackupState {
|
||||
@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
||||
1 file changed, 49 insertions(+), 118 deletions(-)
|
||||
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 032ecc2007..7d254cc1f6 100644
|
||||
index 22420db26a..2e628d68e4 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -52,6 +52,7 @@ static struct PVEBackupState {
|
||||
@ -54,7 +54,7 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
||||
2 files changed, 144 insertions(+), 78 deletions(-)
|
||||
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 7d254cc1f6..59b4034871 100644
|
||||
index 2e628d68e4..9c20ef3a5e 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -33,7 +33,9 @@ const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap";
|
||||
@ -174,7 +174,7 @@ index 0000000000..29f2b3860d
|
||||
+ NULL);
|
||||
+}
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index 59b4034871..ecff792760 100644
|
||||
index 9c20ef3a5e..59ccb38ceb 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -1132,6 +1132,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
|
||||
@ -115,7 +115,7 @@ index 4ce7bc0b5e..0923037dec 100644
|
||||
static void proxmox_backup_schedule_wake(void *data) {
|
||||
CoCtxData *waker = (CoCtxData *)data;
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index ecff792760..ed6cdc1b94 100644
|
||||
index 59ccb38ceb..f858003a06 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -357,7 +357,7 @@ static void job_cancel_bh(void *opaque) {
|
||||
@ -30,7 +30,7 @@ index 89336d93ef..b9e659a0d2 100644
|
||||
false, NULL, // PBS backup-id
|
||||
false, 0, // PBS backup-time
|
||||
diff --git a/pve-backup.c b/pve-backup.c
|
||||
index ed6cdc1b94..8af161c8bf 100644
|
||||
index f858003a06..04ebfc1e33 100644
|
||||
--- a/pve-backup.c
|
||||
+++ b/pve-backup.c
|
||||
@@ -533,6 +533,7 @@ UuidInfo coroutine_fn *qmp_backup(
|
||||
89
debian/patches/series
vendored
89
debian/patches/series
vendored
@ -10,48 +10,47 @@ pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
|
||||
pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch
|
||||
pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch
|
||||
pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch
|
||||
pve/0005-PVE-Config-smm_available-false.patch
|
||||
pve/0006-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
|
||||
pve/0007-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
|
||||
pve/0008-PVE-Up-qmp-add-get_link_status.patch
|
||||
pve/0009-PVE-Up-glusterfs-allow-partial-reads.patch
|
||||
pve/0010-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch
|
||||
pve/0011-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch
|
||||
pve/0012-PVE-Up-qemu-img-dd-add-isize-parameter.patch
|
||||
pve/0013-PVE-Up-qemu-img-dd-add-n-skip_create.patch
|
||||
pve/0014-PVE-virtio-balloon-improve-query-balloon.patch
|
||||
pve/0015-PVE-qapi-modify-query-machines.patch
|
||||
pve/0016-PVE-qapi-modify-spice-query.patch
|
||||
pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch
|
||||
pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch
|
||||
pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
|
||||
pve/0020-PVE-Add-dummy-id-command-line-parameter.patch
|
||||
pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
|
||||
pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
|
||||
pve/0023-PVE-monitor-disable-oob-capability.patch
|
||||
pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
|
||||
pve/0025-PVE-Allow-version-code-in-machine-type.patch
|
||||
pve/0026-PVE-Backup-add-vma-backup-format-code.patch
|
||||
pve/0027-PVE-Backup-add-backup-dump-block-driver.patch
|
||||
pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch
|
||||
pve/0029-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
|
||||
pve/0030-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
|
||||
pve/0031-PVE-various-PBS-fixes.patch
|
||||
pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
|
||||
pve/0033-PVE-add-query_proxmox_support-QMP-command.patch
|
||||
pve/0034-PVE-add-query-pbs-bitmap-info-QMP-call.patch
|
||||
pve/0035-PVE-redirect-stderr-to-journal-when-daemonized.patch
|
||||
pve/0036-PVE-Add-sequential-job-transaction-support.patch
|
||||
pve/0037-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch
|
||||
pve/0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
|
||||
pve/0039-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
|
||||
pve/0040-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
|
||||
pve/0041-PVE-fall-back-to-open-iscsi-initiatorname.patch
|
||||
pve/0042-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
|
||||
pve/0043-PBS-add-master-key-support.patch
|
||||
pve/0044-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch
|
||||
pve/0045-PVE-block-stream-increase-chunk-size.patch
|
||||
pve/0046-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch
|
||||
pve/0047-block-add-alloc-track-driver.patch
|
||||
pve/0048-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch
|
||||
pve/0049-PVE-savevm-async-register-yank-before-migration_inco.patch
|
||||
pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
|
||||
pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
|
||||
pve/0007-PVE-Up-qmp-add-get_link_status.patch
|
||||
pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch
|
||||
pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch
|
||||
pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch
|
||||
pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch
|
||||
pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch
|
||||
pve/0013-PVE-virtio-balloon-improve-query-balloon.patch
|
||||
pve/0014-PVE-qapi-modify-query-machines.patch
|
||||
pve/0015-PVE-qapi-modify-spice-query.patch
|
||||
pve/0016-PVE-add-savevm-async-for-background-state-snapshots.patch
|
||||
pve/0017-PVE-add-optional-buffer-size-to-QEMUFile.patch
|
||||
pve/0018-PVE-block-add-the-zeroinit-block-driver-filter.patch
|
||||
pve/0019-PVE-Add-dummy-id-command-line-parameter.patch
|
||||
pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
|
||||
pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
|
||||
pve/0022-PVE-monitor-disable-oob-capability.patch
|
||||
pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
|
||||
pve/0024-PVE-Allow-version-code-in-machine-type.patch
|
||||
pve/0025-PVE-Backup-add-vma-backup-format-code.patch
|
||||
pve/0026-PVE-Backup-add-backup-dump-block-driver.patch
|
||||
pve/0027-PVE-Backup-proxmox-backup-patches-for-qemu.patch
|
||||
pve/0028-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
|
||||
pve/0029-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
|
||||
pve/0030-PVE-various-PBS-fixes.patch
|
||||
pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
|
||||
pve/0032-PVE-add-query_proxmox_support-QMP-command.patch
|
||||
pve/0033-PVE-add-query-pbs-bitmap-info-QMP-call.patch
|
||||
pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch
|
||||
pve/0035-PVE-Add-sequential-job-transaction-support.patch
|
||||
pve/0036-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch
|
||||
pve/0037-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
|
||||
pve/0038-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
|
||||
pve/0039-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
|
||||
pve/0040-PVE-fall-back-to-open-iscsi-initiatorname.patch
|
||||
pve/0041-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
|
||||
pve/0042-PBS-add-master-key-support.patch
|
||||
pve/0043-PVE-block-pbs-fast-path-reads-without-allocation-if-.patch
|
||||
pve/0044-PVE-block-stream-increase-chunk-size.patch
|
||||
pve/0045-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch
|
||||
pve/0046-block-add-alloc-track-driver.patch
|
||||
pve/0047-PVE-whitelist-invalid-QAPI-names-for-backwards-compa.patch
|
||||
pve/0048-PVE-savevm-async-register-yank-before-migration_inco.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user