Merge remote-tracking branch 'ehabkost/tags/x86-and-machine-pull-request' into staging

[qemu.git] / hw / block / hd-geometry.c

diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index b187878facfc7199eb15c90cd4547a51713b8d02..57ad5012a700a0dba6fc6225d66f7ad84dd44a51 100644 (file)
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -30,7 +30,9 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "sysemu/block-backend.h"
+#include "qemu/bswap.h"
 #include "hw/block/block.h"
 #include "trace.h"
 
@@ -65,7 +67,7 @@ static int guess_disk_lchs(BlockBackend *blk,
      * but also in async I/O mode. So the I/O throttling function has to
      * be disabled temporarily here, not permanently.
      */
-    if (blk_read_unthrottled(blk, 0, buf, 1) < 0) {
+    if (blk_pread_unthrottled(blk, 0, buf, BDRV_SECTOR_SIZE) < 0) {
         return -1;
     }
     /* test msdos magic */