mirror of
https://github.com/qemu/qemu.git
synced 2024-12-17 09:13:44 +08:00
da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
94 lines
2.8 KiB
C
94 lines
2.8 KiB
C
/*
|
|
* 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;
|
|
}
|
|
}
|
|
}
|