86ffd40d11
- Switch method of splitting off hw-s390x-virtio-gpu-ccw.so as a module to what was accepted upstream (bsc#1181103) * Patches dropped: hw-s390x-modularize-virtio-gpu-ccw.patch * Patches added: s390x-add-have_virtio_ccw.patch s390x-modularize-virtio-gpu-ccw.patch s390x-move-S390_ADAPTER_SUPPRESSIBLE.patch - Fix OOB access in sdhci interface (CVE-2020-17380, bsc#1175144, CVE-2020-25085, bsc#1176681, CVE-2021-3409, bsc#1182282) hw-sd-sd-Actually-perform-the-erase-oper.patch hw-sd-sd-Fix-build-error-when-DEBUG_SD-i.patch hw-sd-sdhci-Correctly-set-the-controller.patch hw-sd-sdhci-Don-t-transfer-any-data-when.patch hw-sd-sdhci-Don-t-write-to-SDHC_SYSAD-re.patch hw-sd-sdhci-Limit-block-size-only-when-S.patch hw-sd-sdhci-Reset-the-data-pointer-of-s-.patch hw-sd-sd-Move-the-sd_block_-read-write-a.patch hw-sd-sd-Skip-write-protect-groups-check.patch - Fix potential privilege escalation in virtiofsd tool (CVE-2021-20263, bsc#1183373) tools-virtiofsd-Replace-the-word-whiteli.patch viriofsd-Add-support-for-FUSE_HANDLE_KIL.patch virtiofsd-extract-lo_do_open-from-lo_ope.patch virtiofsd-optionally-return-inode-pointe.patch virtiofsd-prevent-opening-of-special-fil.patch virtiofs-drop-remapped-security.capabili.patch virtiofsd-Save-error-code-early-at-the-f.patch - Fix OOB access (stack overflow) in rtl8139 NIC emulation (CVE-2021-3416, bsc#1182968) net-introduce-qemu_receive_packet.patch rtl8139-switch-to-use-qemu_receive_packe.patch - Fix OOB access (stack overflow) in other NIC emulations (CVE-2021-3416) cadence_gem-switch-to-use-qemu_receive_p.patch dp8393x-switch-to-use-qemu_receive_packe.patch e1000-switch-to-use-qemu_receive_packet-.patch lan9118-switch-to-use-qemu_receive_packe.patch msf2-mac-switch-to-use-qemu_receive_pack.patch pcnet-switch-to-use-qemu_receive_packet-.patch sungem-switch-to-use-qemu_receive_packet.patch tx_pkt-switch-to-use-qemu_receive_packet.patch - Fix heap overflow in MSIx emulation (CVE-2020-27821, bsc#1179686) memory-clamp-cached-translation-in-case-.patch - Include upstream patches designated as stable material and reviewed for applicability to include here hw-arm-virt-Disable-pl011-clock-migratio.patch xen-block-Fix-removal-of-backend-instanc.patch - Fix package scripts to not use hard coded paths for temporary working directories and log files (bsc#1182425) OBS-URL: https://build.opensuse.org/request/show/882222 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=632
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Wed, 9 Mar 2016 15:18:11 -0700
|
|
Subject: xen_disk: Add suse specific flush disable handling and map to QEMU
|
|
equiv
|
|
|
|
Add code to read the suse specific suse-diskcache-disable-flush flag out
|
|
of xenstore, and set the equivalent flag within QEMU.
|
|
|
|
Patch taken from Xen's patch queue, Olaf Hering being the original author.
|
|
[bsc#879425]
|
|
|
|
[BR: minor edits to pass qemu's checkpatch script]
|
|
[BR: With qdevification of xen-block, code has changed significantly]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
---
|
|
hw/block/xen-block.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
|
|
index b1a3fa9b6a91f7748ce54d77cad6..f6b66a0428eaa37db4c1bbe7e2c4 100644
|
|
--- a/hw/block/xen-block.c
|
|
+++ b/hw/block/xen-block.c
|
|
@@ -729,6 +729,8 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
const char *mode = qdict_get_try_str(opts, "mode");
|
|
const char *direct_io_safe = qdict_get_try_str(opts, "direct-io-safe");
|
|
const char *discard_enable = qdict_get_try_str(opts, "discard-enable");
|
|
+ const char *suse_diskcache_disable_flush = qdict_get_try_str(opts,
|
|
+ "suse-diskcache-disable-flush");
|
|
char *driver = NULL;
|
|
char *filename = NULL;
|
|
XenBlockDrive *drive = NULL;
|
|
@@ -797,6 +799,16 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
|
|
}
|
|
}
|
|
|
|
+ if (suse_diskcache_disable_flush) {
|
|
+ unsigned long value;
|
|
+ if (!qemu_strtoul(suse_diskcache_disable_flush, NULL, 2, &value) && !!value) {
|
|
+ QDict *cache_qdict = qdict_new();
|
|
+
|
|
+ qdict_put_bool(cache_qdict, "no-flush", true);
|
|
+ qdict_put_obj(file_layer, "cache", QOBJECT(cache_qdict));
|
|
+ }
|
|
+ }
|
|
+
|
|
/*
|
|
* It is necessary to turn file locking off as an emulated device
|
|
* may have already opened the same image file.
|