util: move declarations out of qemu-common.h

[qemu.git] / block / raw-posix.c

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 076d0708a7052a14d7234fdfc69731a93252ff89..c8e2ec40fbfdb27eb1fdaa7e176b5f6cfe549525 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

-#include "qemu-common.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/cutils.h"

 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"


@@ -51,8 +53,6 @@
 #include <sys/dkio.h>
 #endif
 #ifdef __linux__
 #include <sys/dkio.h>
 #endif
 #ifdef __linux__

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <linux/cdrom.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <linux/cdrom.h>


@@ -779,7 +779,6 @@ static int hdev_probe_geometry(BlockDriverState *bs, HDGeometry *geo)
 {
     BDRVRawState *s = bs->opaque;
     struct hd_geometry ioctl_geo = {0};
 {
     BDRVRawState *s = bs->opaque;
     struct hd_geometry ioctl_geo = {0};

-    uint32_t blksize;

 
     /* If DASD, get its geometry */
     if (check_for_dasd(s->fd) < 0) {
 
     /* If DASD, get its geometry */
     if (check_for_dasd(s->fd) < 0) {


@@ -799,12 +798,6 @@ static int hdev_probe_geometry(BlockDriverState *bs, HDGeometry *geo)
     }
     geo->heads = ioctl_geo.heads;
     geo->sectors = ioctl_geo.sectors;
     }
     geo->heads = ioctl_geo.heads;
     geo->sectors = ioctl_geo.sectors;

-    if (!probe_physical_blocksize(s->fd, &blksize)) {
-        /* overwrite cyls: HDIO_GETGEO result is incorrect for big drives */
-        geo->cylinders = bdrv_nb_sectors(bs) / (blksize / BDRV_SECTOR_SIZE)
-                                             / (geo->heads * geo->sectors);
-        return 0;
-    }

     geo->cylinders = ioctl_geo.cylinders;
 
     return 0;
     geo->cylinders = ioctl_geo.cylinders;
 
     return 0;


@@ -1826,7 +1819,8 @@ static int find_allocation(BlockDriverState *bs, off_t start,
  */
 static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                                     int64_t sector_num,
  */
 static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
                                                     int64_t sector_num,

-                                                    int nb_sectors, int *pnum)
+                                                    int nb_sectors, int *pnum,
+                                                    BlockDriverState **file)

 {
     off_t start, data = 0, hole = 0;
     int64_t total_size;
 {
     off_t start, data = 0, hole = 0;
     int64_t total_size;


@@ -1868,6 +1862,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
         *pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);
         ret = BDRV_BLOCK_ZERO;
     }
         *pnum = MIN(nb_sectors, (data - start) / BDRV_SECTOR_SIZE);
         ret = BDRV_BLOCK_ZERO;
     }

+    *file = bs;

     return ret | BDRV_BLOCK_OFFSET_VALID | start;
 }
 
     return ret | BDRV_BLOCK_OFFSET_VALID | start;
 }