Merge "Adding qemu as a submodule of KVMFORNFV"

1 files changed, 0 insertions, 93 deletions

diff --git a/qemu/hw/block/block.c b/qemu/hw/block/block.c
deleted file mode 100644
index 97a59d4fa..000000000
--- a/qemu/hw/block/block.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Common code for block device models
- *
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or
- * later.  See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-#include "sysemu/blockdev.h"
-#include "sysemu/block-backend.h"
-#include "hw/block/block.h"
-#include "qapi/error.h"
-#include "qemu/error-report.h"
-
-void blkconf_serial(BlockConf *conf, char **serial)
-{
-    DriveInfo *dinfo;
-
-    if (!*serial) {
-        /* try to fall back to value set with legacy -drive serial=... */
-        dinfo = blk_legacy_dinfo(conf->blk);
-        if (dinfo) {
-            *serial = g_strdup(dinfo->serial);
-        }
-    }
-}
-
-void blkconf_blocksizes(BlockConf *conf)
-{
-    BlockBackend *blk = conf->blk;
-    BlockSizes blocksizes;
-    int backend_ret;
-
-    backend_ret = blk_probe_blocksizes(blk, &blocksizes);
-    /* fill in detected values if they are not defined via qemu command line */
-    if (!conf->physical_block_size) {
-        if (!backend_ret) {
-           conf->physical_block_size = blocksizes.phys;
-        } else {
-            conf->physical_block_size = BDRV_SECTOR_SIZE;
-        }
-    }
-    if (!conf->logical_block_size) {
-        if (!backend_ret) {
-            conf->logical_block_size = blocksizes.log;
-        } else {
-            conf->logical_block_size = BDRV_SECTOR_SIZE;
-        }
-    }
-}
-
-void blkconf_geometry(BlockConf *conf, int *ptrans,
-                      unsigned cyls_max, unsigned heads_max, unsigned secs_max,
-                      Error **errp)
-{
-    DriveInfo *dinfo;
-
-    if (!conf->cyls && !conf->heads && !conf->secs) {
-        /* try to fall back to value set with legacy -drive cyls=... */
-        dinfo = blk_legacy_dinfo(conf->blk);
-        if (dinfo) {
-            conf->cyls  = dinfo->cyls;
-            conf->heads = dinfo->heads;
-            conf->secs  = dinfo->secs;
-            if (ptrans) {
-                *ptrans = dinfo->trans;
-            }
-        }
-    }
-    if (!conf->cyls && !conf->heads && !conf->secs) {
-        hd_geometry_guess(conf->blk,
-                          &conf->cyls, &conf->heads, &conf->secs,
-                          ptrans);
-    } else if (ptrans && *ptrans == BIOS_ATA_TRANSLATION_AUTO) {
-        *ptrans = hd_bios_chs_auto_trans(conf->cyls, conf->heads, conf->secs);
-    }
-    if (conf->cyls || conf->heads || conf->secs) {
-        if (conf->cyls < 1 || conf->cyls > cyls_max) {
-            error_setg(errp, "cyls must be between 1 and %u", cyls_max);
-            return;
-        }
-        if (conf->heads < 1 || conf->heads > heads_max) {
-            error_setg(errp, "heads must be between 1 and %u", heads_max);
-            return;
-        }
-        if (conf->secs < 1 || conf->secs > secs_max) {
-            error_setg(errp, "secs must be between 1 and %u", secs_max);
-            return;
-        }
-    }
-}