cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 3d3509c010129bd15eb1f5ec1a7b9eedcdbf23f6 Mon Sep 17 00:00:00 2001
902636
From: Maxim Levitsky <mlevitsk@redhat.com>
902636
Date: Wed, 11 Mar 2020 10:51:44 +0000
902636
Subject: [PATCH 03/20] file-posix: Drop hdev_co_create_opts()
902636
902636
RH-Author: Maxim Levitsky <mlevitsk@redhat.com>
902636
Message-id: <20200311105147.13208-4-mlevitsk@redhat.com>
902636
Patchwork-id: 94225
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 3/6] file-posix: Drop hdev_co_create_opts()
902636
Bugzilla: 1640894
902636
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
902636
RH-Acked-by: John Snow <jsnow@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
902636
From: Max Reitz <mreitz@redhat.com>
902636
902636
The generic fallback implementation effectively does the same.
902636
902636
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
902636
Signed-off-by: Max Reitz <mreitz@redhat.com>
902636
Message-Id: <20200122164532.178040-4-mreitz@redhat.com>
902636
Signed-off-by: Max Reitz <mreitz@redhat.com>
902636
(cherry picked from commit 87ca3b8fa615b278b33cabf9ed22b3f44b5214ba)
902636
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 block/file-posix.c | 67 ------------------------------------------------------
902636
 1 file changed, 67 deletions(-)
902636
902636
diff --git a/block/file-posix.c b/block/file-posix.c
902636
index 1b805bd..fd29372 100644
902636
--- a/block/file-posix.c
902636
+++ b/block/file-posix.c
902636
@@ -3418,67 +3418,6 @@ static coroutine_fn int hdev_co_pwrite_zeroes(BlockDriverState *bs,
902636
     return raw_do_pwrite_zeroes(bs, offset, bytes, flags, true);
902636
 }
902636
 
902636
-static int coroutine_fn hdev_co_create_opts(const char *filename, QemuOpts *opts,
902636
-                                            Error **errp)
902636
-{
902636
-    int fd;
902636
-    int ret = 0;
902636
-    struct stat stat_buf;
902636
-    int64_t total_size = 0;
902636
-    bool has_prefix;
902636
-
902636
-    /* This function is used by both protocol block drivers and therefore either
902636
-     * of these prefixes may be given.
902636
-     * The return value has to be stored somewhere, otherwise this is an error
902636
-     * due to -Werror=unused-value. */
902636
-    has_prefix =
902636
-        strstart(filename, "host_device:", &filename) ||
902636
-        strstart(filename, "host_cdrom:" , &filename);
902636
-
902636
-    (void)has_prefix;
902636
-
902636
-    ret = raw_normalize_devicepath(&filename, errp);
902636
-    if (ret < 0) {
902636
-        return ret;
902636
-    }
902636
-
902636
-    /* Read out options */
902636
-    total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
902636
-                          BDRV_SECTOR_SIZE);
902636
-
902636
-    fd = qemu_open(filename, O_WRONLY | O_BINARY);
902636
-    if (fd < 0) {
902636
-        ret = -errno;
902636
-        error_setg_errno(errp, -ret, "Could not open device");
902636
-        return ret;
902636
-    }
902636
-
902636
-    if (fstat(fd, &stat_buf) < 0) {
902636
-        ret = -errno;
902636
-        error_setg_errno(errp, -ret, "Could not stat device");
902636
-    } else if (!S_ISBLK(stat_buf.st_mode) && !S_ISCHR(stat_buf.st_mode)) {
902636
-        error_setg(errp,
902636
-                   "The given file is neither a block nor a character device");
902636
-        ret = -ENODEV;
902636
-    } else if (lseek(fd, 0, SEEK_END) < total_size) {
902636
-        error_setg(errp, "Device is too small");
902636
-        ret = -ENOSPC;
902636
-    }
902636
-
902636
-    if (!ret && total_size) {
902636
-        uint8_t buf[BDRV_SECTOR_SIZE] = { 0 };
902636
-        int64_t zero_size = MIN(BDRV_SECTOR_SIZE, total_size);
902636
-        if (lseek(fd, 0, SEEK_SET) == -1) {
902636
-            ret = -errno;
902636
-        } else {
902636
-            ret = qemu_write_full(fd, buf, zero_size);
902636
-            ret = ret == zero_size ? 0 : -errno;
902636
-        }
902636
-    }
902636
-    qemu_close(fd);
902636
-    return ret;
902636
-}
902636
-
902636
 static BlockDriver bdrv_host_device = {
902636
     .format_name        = "host_device",
902636
     .protocol_name        = "host_device",
902636
@@ -3491,8 +3430,6 @@ static BlockDriver bdrv_host_device = {
902636
     .bdrv_reopen_prepare = raw_reopen_prepare,
902636
     .bdrv_reopen_commit  = raw_reopen_commit,
902636
     .bdrv_reopen_abort   = raw_reopen_abort,
902636
-    .bdrv_co_create_opts = hdev_co_create_opts,
902636
-    .create_opts         = &raw_create_opts,
902636
     .mutable_opts        = mutable_opts,
902636
     .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
902636
     .bdrv_co_pwrite_zeroes = hdev_co_pwrite_zeroes,
902636
@@ -3619,8 +3556,6 @@ static BlockDriver bdrv_host_cdrom = {
902636
     .bdrv_reopen_prepare = raw_reopen_prepare,
902636
     .bdrv_reopen_commit  = raw_reopen_commit,
902636
     .bdrv_reopen_abort   = raw_reopen_abort,
902636
-    .bdrv_co_create_opts = hdev_co_create_opts,
902636
-    .create_opts         = &raw_create_opts,
902636
     .mutable_opts        = mutable_opts,
902636
     .bdrv_co_invalidate_cache = raw_co_invalidate_cache,
902636
 
902636
@@ -3753,8 +3688,6 @@ static BlockDriver bdrv_host_cdrom = {
902636
     .bdrv_reopen_prepare = raw_reopen_prepare,
902636
     .bdrv_reopen_commit  = raw_reopen_commit,
902636
     .bdrv_reopen_abort   = raw_reopen_abort,
902636
-    .bdrv_co_create_opts = hdev_co_create_opts,
902636
-    .create_opts        = &raw_create_opts,
902636
     .mutable_opts       = mutable_opts,
902636
 
902636
     .bdrv_co_preadv         = raw_co_preadv,
902636
-- 
902636
1.8.3.1
902636