1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
From 9ca9391acb780f15a6d8769339e7cd0edf457529 Mon Sep 17 00:00:00 2001
|
|
From: Jinhua Cao <caojinhua1@huawei.com>
|
|
Date: Thu, 24 Mar 2022 17:12:49 +0800
|
|
Subject: [PATCH] qemu-img create: 'cache' paramter only use for reg file image
|
|
|
|
The paramter 'cache' is invalid for host device(/dev/xxx). If
|
|
'qemu-img create' operator performed on host device, the host
|
|
device not support 'cache' would result 'qemu-img create' execute
|
|
failed.
|
|
|
|
Signed-off-by: Jinhua Cao <caojinhua1@huawei.com>
|
|
---
|
|
qemu-img.c | 30 ++++++++++++++++++++++++------
|
|
1 file changed, 24 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index 80adee2620..49d914c9c4 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -508,6 +508,22 @@ static int64_t cvtnum(const char *name, const char *value)
|
|
return cvtnum_full(name, value, 0, INT64_MAX);
|
|
}
|
|
|
|
+static bool is_reg_file(const char *filename)
|
|
+{
|
|
+ struct stat st;
|
|
+
|
|
+ /* file not exist, file will be create later, so it's a reg file */
|
|
+ if (access(filename, F_OK) == -1) {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ /* file exist, check file type */
|
|
+ if (stat(filename, &st) >= 0 && S_ISREG(st.st_mode)) {
|
|
+ return true;
|
|
+ }
|
|
+ return false;
|
|
+}
|
|
+
|
|
static int img_create(int argc, char **argv)
|
|
{
|
|
int c;
|
|
@@ -598,12 +614,14 @@ static int img_create(int argc, char **argv)
|
|
error_exit("Unexpected argument: %s", argv[optind]);
|
|
}
|
|
|
|
- if (!options) {
|
|
- options = g_strdup_printf(BLOCK_OPT_CACHE"=%s", cache);
|
|
- } else {
|
|
- char *old_options = options;
|
|
- options = g_strdup_printf("%s,"BLOCK_OPT_CACHE"=%s", options, cache);
|
|
- g_free(old_options);
|
|
+ if (is_reg_file(filename)) {
|
|
+ if (!options) {
|
|
+ options = g_strdup_printf(BLOCK_OPT_CACHE"=%s", cache);
|
|
+ } else {
|
|
+ char *old_options = options;
|
|
+ options = g_strdup_printf("%s,"BLOCK_OPT_CACHE"=%s", options, cache);
|
|
+ g_free(old_options);
|
|
+ }
|
|
}
|
|
|
|
bdrv_img_create(filename, fmt, base_filename, base_fmt,
|
|
--
|
|
2.27.0
|
|
|