[Qemu-devel] [PATCH 18/32] hd-geometry: Switch to uint32_t to match BlockConf

2012-06-29 Thread Markus Armbruster
Best to use the same type, to avoid unwanted truncation or sign extension. BlockConf can't use plain int for cyls, heads and secs, because integer properties require an exact width. Signed-off-by: Markus Armbruster --- blockdev.h |2 +- hw/hd-geometry.c |4 ++-- hw/ide/c

[Qemu-devel] [PATCH 02/32] fdc: Move floppy geometry guessing back from block.c

2012-06-29 Thread Markus Armbruster
es. Bonus: the floppy type used in pc_cmos_init() now obviously matches the one in the FDrive. Before, we relied on bdrv_get_floppy_geometry_hint() picking the same type both in fd_revalidate() and in pc_cmos_init(). Signed-off-by: Markus Armbruster --- block

[Qemu-devel] [PATCH 31/32] blockdev: Drop redundant CHS validation for if=ide

2012-06-29 Thread Markus Armbruster
Leave it to ide_init_drive(). Signed-off-by: Markus Armbruster --- blockdev.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index 37521b5..d5f2f57 100644 --- a/blockdev.c +++ b/blockdev.c @@ -330,15 +330,15 @@ DriveInfo *drive_init

[Qemu-devel] [PATCH 21/32] ide: qdev properties for disk geometry

2012-06-29 Thread Markus Armbruster
y. Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/ide/core.c | 19 ++- hw/ide/internal.h |4 +++- hw/ide/qdev.c | 21 - 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.

[Qemu-devel] [PATCH 10/32] hd-geometry: Unnest conditional in hd_geometry_guess()

2012-06-29 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 84 +++--- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 70eb116..3f3070b 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c

[Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly

2012-06-29 Thread Markus Armbruster
Each test litters /tmp with several files: a pid file and two sockets. Tidy up. Signed-off-by: Markus Armbruster --- tests/libqtest.c | 29 - 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 071b6be

[Qemu-devel] [PATCH 07/32] block: Factor bdrv_read_unthrottled() out of guess_disk_lchs()

2012-06-29 Thread Markus Armbruster
To prepare move of guess_disk_lchs() into hw/, where it poking BlockDriverState member io_limits_enabled directly would be unclean. Signed-off-by: Markus Armbruster --- block.c | 24 +--- block.h |2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a

[Qemu-devel] [PATCH 01/32] fdc: Drop broken code for user-defined floppy geometry

2012-06-29 Thread Markus Armbruster
, just like before commit c219331e. Matches -help, which explains cyls, heads, secs as "hard disk physical geometry". Signed-off-by: Markus Armbruster --- block.c | 62 -- hw/fdc.c |3 --- 2 files changed, 28 insert

[Qemu-devel] [PATCH 30/32] hd-geometry: Compute BIOS CHS translation in one place

2012-06-29 Thread Markus Armbruster
Currently, it is split between hd_geometry_guess() and pc_cmos_init_late(). Confusing. info qtree shows the result of the former. Also confusing. Fold the part done in pc_cmos_init_late() into hd_geometry_guess(). Signed-off-by: Markus Armbruster --- blockdev.h |1 + hw/hd

[Qemu-devel] [PATCH 32/32] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255

2012-06-29 Thread Markus Armbruster
New limits straight from ATA4 6.2 Register delivered data transfer command sector addressing. I figure the old sector limit 63 was blindly copied from the BIOS int 13 limit. Doesn't apply to the hardware. No idea where the old cylinder limit comes from. Signed-off-by: Markus Armbr

[Qemu-devel] [PATCH 06/32] qtest: Add hard disk geometry test

2012-06-29 Thread Markus Armbruster
So far covers only IDE and tests only CMOS contents. Signed-off-by: Markus Armbruster --- tests/Makefile |2 + tests/hd-geo-test.c | 402 +++ 2 files changed, 404 insertions(+), 0 deletions(-) create mode 100644 tests/hd-geo-test.c

[Qemu-devel] [PATCH 08/32] hd-geometry: Move disk geometry guessing back from block.c

2012-06-29 Thread Markus Armbruster
Commit f3d54fc4 factored it out of hw/ide.c for reuse. Sensible, except it was put into block.c. Device-specific functionality should be kept in device code, not the block layer. Move it to hw/hd-geometry.c, and make stylistic changes required to keep checkpatch.pl happy. Signed-off-by: Markus

[Qemu-devel] [PATCH 16/32] blockdev: Save geometry in DriveInfo

2012-06-29 Thread Markus Armbruster
In preparation of purging it from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- blockdev.c |4 blockdev.h |1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index 9e0a72a..4d3b707 100644 --- a

[Qemu-devel] [PATCH 11/32] hd-geometry: Factor out guess_chs_for_size()

2012-06-29 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 32 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 3f3070b..4e47ec6 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -88,14 +88,31

[Qemu-devel] [PATCH 13/32] hd-geometry: Clean up confusing use of prior translation hint

2012-06-29 Thread Markus Armbruster
number of cylinders. Since hd_geometry_guess() returns right away when it finds a valid geometry hint, translation can only be BIOS_ATA_TRANSLATION_AUTO in the remainder of the function. Assert this, and simplify accordingly. Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 17 +++---

[Qemu-devel] [PATCH 17/32] qdev: Introduce block geometry properties

2012-06-29 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- block.h |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/block.h b/block.h index 052d0ce..e0121d5 100644 --- a/block.h +++ b/block.h @@ -427,6 +427,8 @@ typedef struct BlockConf { uint32_t opt_io_size; int32_t

[Qemu-devel] [PATCH 22/32] qtest: Cover qdev properties for disk geometry

2012-06-29 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 0ab573c..02eb5c2 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,13 +321,15 @@ static void

[Qemu-devel] [PATCH 00/32] Disk geometry cleanup

2012-06-29 Thread Markus Armbruster
rties for disk geometry Part VI [PATCH 16-27/32]: A few more fixes and cleanups This patch series is also available at git://repo.or.cz/qemu/armbru.git tag geo-v1 Markus Armbruster (32): fdc: Drop broken code for user-defined floppy geometry fdc: Move floppy geometry guessing back from bl

[Qemu-devel] [PATCH 09/32] hd-geometry: Add tracepoints

2012-06-29 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c |7 +++ trace-events |4 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 9b22e3f..70eb116 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -23,6 +23,7

[Qemu-devel] [PATCH 15/32] ide pc: Cut out the block layer geometry middleman

2012-06-29 Thread Markus Armbruster
PC BIOS setup needs IDE geometry information. Get it directly from the device model rather than through the block layer. In preparation of purging geometry from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/ide.h |4 +++- hw/ide

[Qemu-devel] [PATCH 27/32] block: Geometry and translation hints are now useless, purge them

2012-06-29 Thread Markus Armbruster
nders the hints unused. Purge them from the block layer. Signed-off-by: Markus Armbruster --- block.c | 32 block.h | 12 block_int.h |1 - blockdev.c | 12 +--- blockdev.h |7 ++

[Qemu-devel] [PATCH 03/32] vvfat: Fix partition table

2012-06-29 Thread Markus Armbruster
0,1,1 1023,14,55 631032057 :12: 0,1,163,14,55 63 64377 The actual FAT file system nevertheless assumes the partition has 1032129 or 64449 sectors. Oops. Signed-off-by: Markus Armbruster --- block/vvfat.c |7 --- 1 files changed, 4

[Qemu-devel] [PATCH 23/32] qdev: Collect private helpers in one place

2012-06-29 Thread Markus Armbruster
Just code motion, with one long line wrapped to keep checkpatch.pl happy. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 144 +- 1 files changed, 72 insertions(+), 72 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev

Re: [Qemu-devel] [PATCH 03/32] vvfat: Fix partition table

2012-06-29 Thread Markus Armbruster
Blue Swirl writes: > On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster wrote: >> Unless parameter ":floppy:" is given, vvfat creates a virtual image >> with DOS MBR defining a single partition which holds the FAT file >> system.  The size of the virtual image dep

Re: [Qemu-devel] [PATCH 06/32] qtest: Add hard disk geometry test

2012-06-29 Thread Markus Armbruster
Blue Swirl writes: > On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster wrote: >> So far covers only IDE and tests only CMOS contents. >> >> Signed-off-by: Markus Armbruster >> --- >>  tests/Makefile      |    2

Re: [Qemu-devel] [PATCH 08/32] hd-geometry: Move disk geometry guessing back from block.c

2012-06-29 Thread Markus Armbruster
Blue Swirl writes: > On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster wrote: >> Commit f3d54fc4 factored it out of hw/ide.c for reuse.  Sensible, >> except it was put into block.c.  Device-specific functionality should >> be kept in device code, not the block layer.

Re: [Qemu-devel] [PATCH 07/17] x86: improve SSE table type safety

2012-07-02 Thread Markus Armbruster
Blue Swirl writes: > SSE function tables could easily be corrupted because of use > of void pointers. > > Introduce function pointer types and helper variables in order > to improve type safety. > > Split sse_op_table3 according to types used. > > Signed-off-by: Blue Swirl Clean build on master

Re: [Qemu-devel] [PATCH 18/32] hd-geometry: Switch to uint32_t to match BlockConf

2012-07-02 Thread Markus Armbruster
Andreas Färber writes: > Am 02.07.2012 14:55, schrieb Stefan Hajnoczi: >> On Fri, Jun 29, 2012 at 05:34:40PM +0200, Markus Armbruster wrote: >>> Best to use the same type, to avoid unwanted truncation or sign >>> extension. >>> >>> BlockConf can'

Re: [Qemu-devel] [PATCH 04/32] vvfat: Do not clobber the user's geometry

2012-07-05 Thread Markus Armbruster
;>>> >>>>> No change without format=vvfat. With it, the user's hard disk >>>>> geometry (-drive options cyls, heads, secs) is now obeyed, and the >>>>> default hard disk geometry with :floppy: now matches the one without >>>>> format

Re: [Qemu-devel] [PATCH 03/32] vvfat: Fix partition table

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 22:33, schrieb Blue Swirl: >> On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster wrote: >>> Unless parameter ":floppy:" is given, vvfat creates a virtual image >>> with DOS MBR defining a single partition which holds the

Re: [Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 17:34, schrieb Markus Armbruster: >> Each test litters /tmp with several files: a pid file and two >> sockets. Tidy up. >> >> Signed-off-by: Markus Armbruster > > Thanks! Still leaves the files around if a test case fails,

Re: [Qemu-devel] [PATCH 13/32] hd-geometry: Clean up confusing use of prior translation hint

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 17:34, schrieb Markus Armbruster: >> When hd_geometry_guess() picks a geometry, it also picks the >> appropriate translation, but only when the prior translation hint is >> BIOS_ATA_TRANSLATION_AUTO. Looks wrong, because such a prior &g

Re: [Qemu-devel] [PATCH 03/32] vvfat: Fix partition table

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 05.07.2012 11:23, schrieb Markus Armbruster: >> Kevin Wolf writes: >> >>> Am 29.06.2012 22:33, schrieb Blue Swirl: >>>> On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster >>>> wrote: >>>>> Unless paramete

Re: [Qemu-devel] [PATCH 04/32] vvfat: Do not clobber the user's geometry

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 17:34, schrieb Markus Armbruster: [...] >> @@ -1067,19 +1074,16 @@ DLOG(if (stderr == NULL) { >> else >> dirname += i+1; >> >> -bs->total_sectors=bs->cyls*bs->heads*bs->secs; >> +bs-&g

Re: [Qemu-devel] [PATCH 22/32] qtest: Cover qdev properties for disk geometry

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 17:34, schrieb Markus Armbruster: >> Signed-off-by: Markus Armbruster >> --- >> tests/hd-geo-test.c |6 -- >> 1 files changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/tests/hd-geo-test.c b/tests/

Re: [Qemu-devel] [PATCH 32/32] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255

2012-07-05 Thread Markus Armbruster
Kevin Wolf writes: > Am 29.06.2012 17:34, schrieb Markus Armbruster: >> New limits straight from ATA4 6.2 Register delivered data transfer >> command sector addressing. >> >> I figure the old sector limit 63 was blindly copied from the BIOS >> int 13 limit. D

Re: [Qemu-devel] [PATCH 32/32] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255

2012-07-05 Thread Markus Armbruster
Markus Armbruster writes: > Kevin Wolf writes: > >> Am 29.06.2012 17:34, schrieb Markus Armbruster: >>> New limits straight from ATA4 6.2 Register delivered data transfer >>> command sector addressing. >>> >>> I figure the old sector limit 63 w

Re: [Qemu-devel] [PATCH] memory: add -dont-dump-guest option to reduce core dump size

2012-07-05 Thread Markus Armbruster
Marcelo Tosatti writes: > On Mon, May 21, 2012 at 01:53:36PM -0400, Jason Baron wrote: >> On Fri, May 04, 2012 at 05:23:51PM -0400, Jason Baron wrote: >> > Add a command line parameter to not dump guest memory in the core dump, the >> > command line is: -dont-dump-guest. This brought the core dum

[Qemu-devel] [PATCH 11/32] hd-geometry: Factor out guess_chs_for_size()

2012-07-05 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 32 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index db47846..1a58894 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -97,14 +97,31

[Qemu-devel] [PATCH 31/32] blockdev: Drop redundant CHS validation for if=ide

2012-07-05 Thread Markus Armbruster
Leave it to ide_init_drive(). Signed-off-by: Markus Armbruster --- blockdev.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blockdev.c b/blockdev.c index 3274923..201c641 100644 --- a/blockdev.c +++ b/blockdev.c @@ -330,15 +330,15 @@ DriveInfo *drive_init

[Qemu-devel] [PATCH 03/32] vvfat: Fix partition table

2012-07-05 Thread Markus Armbruster
0,1,1 1023,14,55 631032057 :12: 0,1,163,14,55 63 64377 The actual FAT file system nevertheless assumes the partition has 1032129 or 64449 sectors. Oops. Signed-off-by: Markus Armbruster --- block/vvfat.c |7 --- 1 files changed, 4

[Qemu-devel] [PATCH 26/32] qtest: Cover qdev property for BIOS CHS translation

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c | 13 +++-- 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index a47b945..5d9d2e4 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,15 +321,16 @@ static

[Qemu-devel] [PATCH 22/32] qtest: Cover qdev properties for disk geometry

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index cc447a2..a47b945 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,13 +321,15 @@ static void

[Qemu-devel] [PATCH 15/32] ide pc: Cut out the block layer geometry middleman

2012-07-06 Thread Markus Armbruster
PC BIOS setup needs IDE geometry information. Get it directly from the device model rather than through the block layer. In preparation of purging geometry from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/ide.h |4 +++- hw/ide

[Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly

2012-07-06 Thread Markus Armbruster
Each test litters /tmp with several files: a pid file and two sockets. Tidy up. Signed-off-by: Markus Armbruster --- tests/libqtest.c | 29 - 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 071b6be

Re: [Qemu-devel] [PATCH v2] vnc: add a more descriptive error message

2012-07-06 Thread Markus Armbruster
Michael Tokarev writes: > On 06.07.2012 06:42, Amos Kong wrote: >> On 30/06/12 10:02, ak...@redhat.com wrote: >>> From: Amos Kong >>> >>> Currently qemu outputs some low-level error in qemu-sockets.c >>> when failed to start vnc server. >>> eg. 'getaddrinfo(127.0.0.1,5902): Name or service not kn

[Qemu-devel] [PATCH 20/32] virtio-blk: qdev properties for disk geometry

2012-07-06 Thread Markus Armbruster
Geometry needs to be qdev properties, because it belongs to the disk's guest part. Maintain backward compatibility exactly like for serial: fall back to DriveInfo's geometry, set with -drive cyls=... Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/s

[Qemu-devel] [PATCH 21/32] ide: qdev properties for disk geometry

2012-07-06 Thread Markus Armbruster
y. Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/ide/core.c | 19 ++- hw/ide/internal.h |4 +++- hw/ide/qdev.c | 22 +- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.

[Qemu-devel] [PATCH 27/32] block: Geometry and translation hints are now useless, purge them

2012-07-06 Thread Markus Armbruster
nders the hints unused. Purge them from the block layer. Signed-off-by: Markus Armbruster --- block.c | 32 block.h | 12 block_int.h |1 - blockdev.c | 14 ++ hw/block-common.h|

[Qemu-devel] [PATCH 07/32] block: Factor bdrv_read_unthrottled() out of guess_disk_lchs()

2012-07-06 Thread Markus Armbruster
To prepare move of guess_disk_lchs() into hw/, where it poking BlockDriverState member io_limits_enabled directly would be unclean. Signed-off-by: Markus Armbruster --- block.c | 24 +--- block.h |2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a

[Qemu-devel] [PATCH 23/32] qdev: Collect private helpers in one place

2012-07-06 Thread Markus Armbruster
Just code motion, with one long line wrapped to keep checkpatch.pl happy. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 144 +- 1 files changed, 72 insertions(+), 72 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev

[Qemu-devel] [PATCH 04/32] vvfat: Do not clobber the user's geometry

2012-07-06 Thread Markus Armbruster
now obeyed, and the default hard disk geometry with :floppy: now matches the one without format=vvfat. Signed-off-by: Markus Armbruster --- block/vvfat.c | 52 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/block/vvfat.c b/blo

[Qemu-devel] [PATCH 17/32] qdev: Introduce block geometry properties

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- block.h |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/block.h b/block.h index 052d0ce..e0121d5 100644 --- a/block.h +++ b/block.h @@ -427,6 +427,8 @@ typedef struct BlockConf { uint32_t opt_io_size; int32_t

[Qemu-devel] [PATCH 09/32] hd-geometry: Add tracepoints

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c |7 +++ trace-events |4 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index c45eafd..f0dd021 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -32,6 +32,7

Re: [Qemu-devel] [PATCH 00/32] Disk geometry cleanup

2012-07-06 Thread Markus Armbruster
I screwed up Subject: lacks "v2". Sorry!

[Qemu-devel] [PATCH 12/32] hd-geometry: Clean up gratuitous goto in hd_geometry_guess()

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 22 -- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 1a58894..fb849a3 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -119,8 +119,7 @@ static void

[Qemu-devel] [PATCH 28/32] ide pc: Put hard disk info into CMOS only for hard disks

2012-07-06 Thread Markus Armbruster
In particular, don't set disk type and geometry when a CD-ROM on bus ide.0 has media during CMOS initialization. Signed-off-by: Markus Armbruster --- hw/ide/qdev.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index f191dd3..84

[Qemu-devel] [PATCH 32/32] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255

2012-07-06 Thread Markus Armbruster
New limits straight from ATA4 6.2 Register delivered data transfer command sector addressing. I figure the old sector limit 63 was blindly copied from the BIOS int 13 limit. Doesn't apply to the hardware. No idea where the old cylinder limit comes from. Signed-off-by: Markus Armbr

[Qemu-devel] [PATCH 29/32] qtest: Test we don't put hard disk info into CMOS for a CD-ROM

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 5d9d2e4..9a31e85 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -369,6 +369,27

[Qemu-devel] [PATCH 10/32] hd-geometry: Unnest conditional in hd_geometry_guess()

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 84 +++--- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index f0dd021..db47846 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c

[Qemu-devel] [PATCH 06/32] qtest: Add hard disk geometry test

2012-07-06 Thread Markus Armbruster
So far covers only IDE and tests only CMOS contents. Signed-off-by: Markus Armbruster --- tests/Makefile |2 + tests/hd-geo-test.c | 403 +++ 2 files changed, 405 insertions(+), 0 deletions(-) create mode 100644 tests/hd-geo-test.c

[Qemu-devel] [PATCH 02/32] fdc: Move floppy geometry guessing back from block.c

2012-07-06 Thread Markus Armbruster
es. Bonus: the floppy type used in pc_cmos_init() now obviously matches the one in the FDrive. Before, we relied on bdrv_get_floppy_geometry_hint() picking the same type both in fd_revalidate() and in pc_cmos_init(). Signed-off-by: Markus Armbruster --- block

[Qemu-devel] [PATCH 18/32] hd-geometry: Switch to uint32_t to match BlockConf

2012-07-06 Thread Markus Armbruster
Best to use the same type, to avoid unwanted truncation or sign extension. BlockConf can't use plain int for cyls, heads and secs, because integer properties require an exact width. Signed-off-by: Markus Armbruster --- hw/block-common.h |2 +- hw/hd-geometry.c |4 ++-- hw/ide/c

[Qemu-devel] [PATCH 19/32] scsi-hd: qdev properties for disk geometry

2012-07-06 Thread Markus Armbruster
ry. scsi-block should get geometry from the host disk. Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 69 +-- 1 files changed, 46 insertions(+), 23 deletions(-) diff --git a/hw/scsi-disk.c b

[Qemu-devel] [PATCH 14/32] hd-geometry: Cut out block layer translation middleman

2012-07-06 Thread Markus Armbruster
the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/block-common.h |3 ++- hw/hd-geometry.c | 20 ++-- hw/ide/core.c |2 +- hw/scsi-disk.c|4 ++-- hw/virtio-blk.c |2 +- 5 files changed, 20 insertions(+), 11

[Qemu-devel] [PATCH 16/32] blockdev: Save geometry in DriveInfo

2012-07-06 Thread Markus Armbruster
In preparation of purging it from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- blockdev.c |4 blockdev.h |1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index 9e0a72a..4d3b707 100644 --- a

[Qemu-devel] [PATCH 01/32] fdc: Drop broken code for user-defined floppy geometry

2012-07-06 Thread Markus Armbruster
, just like before commit c219331e. Matches -help, which explains cyls, heads, secs as "hard disk physical geometry". Signed-off-by: Markus Armbruster --- block.c | 62 -- hw/fdc.c |3 --- 2 files changed, 28 insert

[Qemu-devel] [PATCH 25/32] ide: qdev property for BIOS CHS translation

2012-07-06 Thread Markus Armbruster
ranslation, set with -drive trans=... Bonus: info qtree now shows the translation. Except when it shows "auto": that's resolved by pc_cmos_init_late(). To be addressed shortly. Signed-off-by: Markus Armbruster --- hw/ide/internal.h |1 + hw/ide/qdev.c | 10 +-

[Qemu-devel] [PATCH 30/32] hd-geometry: Compute BIOS CHS translation in one place

2012-07-06 Thread Markus Armbruster
Currently, it is split between hd_geometry_guess() and pc_cmos_init_late(). Confusing. info qtree shows the result of the former. Also confusing. Fold the part done in pc_cmos_init_late() into hd_geometry_guess(). Signed-off-by: Markus Armbruster --- hw/block-common.h |1 + hw/hd

[Qemu-devel] [PATCH 24/32] qdev: New property type chs-translation

2012-07-06 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 15 +++ hw/qdev.h|3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 002c7f9..0b18f8c 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev

[Qemu-devel] [PATCH 00/32] Disk geometry cleanup

2012-07-06 Thread Markus Armbruster
rties for disk geometry Part VI [PATCH 28-32/32]: A few more fixes and cleanups This patch series is also available at git://repo.or.cz/qemu/armbru.git tag geo-v2 v2: New hw/block-common.h (Blue & Kevin) Coding style here & there (Blue) Tracepoint parameter types (Stefan) Mark

[Qemu-devel] [PATCH 13/32] hd-geometry: Clean up confusing use of prior translation hint

2012-07-06 Thread Markus Armbruster
cylinders. Since hd_geometry_guess() returns right away when it finds a valid geometry hint, translation can only be BIOS_ATA_TRANSLATION_AUTO in the remainder of the function. Assert this, and simplify accordingly. Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 17 +++-

[Qemu-devel] [PATCH 08/32] hd-geometry: Move disk geometry guessing back from block.c

2012-07-06 Thread Markus Armbruster
Commit f3d54fc4 factored it out of hw/ide.c for reuse. Sensible, except it was put into block.c. Device-specific functionality should be kept in device code, not the block layer. Move it to hw/hd-geometry.c, and make stylistic changes required to keep checkpatch.pl happy. Signed-off-by: Markus

Re: [Qemu-devel] [PATCH 32/32] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255

2012-07-06 Thread Markus Armbruster
Alexander Graf writes: > On 05.07.2012, at 18:20, Markus Armbruster wrote: [...] >> When it comes to block device models, IDE is *always* the troublemaker. >> And a big reason for that is the messy data structures that are >> impractical to clean up while we still supp

Re: [Qemu-devel] [PATCH] bitops: fix types

2012-07-09 Thread Markus Armbruster
Peter Maydell writes: > On 8 July 2012 13:12, wrote: >> -static inline uint64_t deposit64(uint64_t value, int start, int length, >> - uint64_t fieldval) >> +static inline uint64_t deposit64(uint64_t value, unsigned int start, >> +

Re: [Qemu-devel] [PATCH 1/5] Avoid GCC extension ?:

2012-07-09 Thread Markus Armbruster
blauwir...@gmail.com writes: > From: Blue Swirl > > Replace expr1 ?: expr2 with expr1 ? expr1 : expr2 as K&R intended. > > If expr1 has side effects, introduce a temporary variable. > > Signed-off-by: Blue Swirl > --- > block.c |6 -- > block/qcow2.c|6 -- >

Re: [Qemu-devel] [PATCH v2 1/3] bitops: fix types

2012-07-09 Thread Markus Armbruster
blauwir...@gmail.com writes: > From: Blue Swirl > > Use 'unsigned int' for bit numbers instead of 'unsigned long' or > 'int'. Adjust asserts. I'd like to lodge a formal objection to this part. There is no consensus. I recognize the power of maintainers to force a change even without consensus.

Re: [Qemu-devel] [PATCH v2 3/3] bitops: use bool

2012-07-09 Thread Markus Armbruster
blauwir...@gmail.com writes: > From: Blue Swirl > > Use 'bool' type for return value of bit test functions. Matter of taste. 'bool' makes sense if you think of these functions as predicates (ugly ones, with side effects). 'int' makes sense if you think of them as returning the bit value (a bit

Re: [Qemu-devel] [PATCH v2] ahci: add -drive support

2012-07-09 Thread Markus Armbruster
Alexander Graf writes: > We've had support for creating AHCI devices using -device for a while now, > but it's cumbersome to users. We really should provide an easier way for > them to leverage the power of AHCI! > > So let's introduce a new if= option to -drive, giving users the same > command l

Re: [Qemu-devel] [PATCH 05/32] qtest: Tidy up temporary files properly

2012-07-09 Thread Markus Armbruster
Blue Swirl writes: > On Fri, Jul 6, 2012 at 6:57 AM, Markus Armbruster wrote: >> Each test litters /tmp with several files: a pid file and two >> sockets. Tidy up. >> >> Signed-off-by: Markus Armbruster > > While a nice patch, I don't think it should b

Re: [Qemu-devel] [PATCH v2] ahci: add -drive support

2012-07-09 Thread Markus Armbruster
Gerd Hoffmann writes: > Hi, > >>> If -hda has the semantics of "create an IDE device", then no, we can't >>> change it. It doesn't however. IIRC on -M pseries -hda creates SCSI >>> devices. On s390 -hda creates virtio devices. So if on -M q35 -hda would >>> create if=ahci, I don't see how th

Re: [Qemu-devel] [PATCH v2] ahci: add -drive support

2012-07-09 Thread Markus Armbruster
Kevin Wolf writes: > Am 09.07.2012 10:50, schrieb Markus Armbruster: >> Alexander Graf writes: >> >>> We've had support for creating AHCI devices using -device for a while now, >>> but it's cumbersome to users. We really should provide an easier way

Re: [Qemu-devel] [PATCH v2] ahci: add -drive support

2012-07-09 Thread Markus Armbruster
Alexander Graf writes: > On 09.07.2012, at 13:06, Markus Armbruster wrote: > >> Kevin Wolf writes: >> >>> Am 09.07.2012 10:50, schrieb Markus Armbruster: >>>> Alexander Graf writes: >>>> >>>>> We've had support

Re: [Qemu-devel] [PATCH] Support 'help' as a synonym for '?' in command line options

2012-07-09 Thread Markus Armbruster
Eric Blake writes: > On 07/09/2012 06:10 AM, Peter Maydell wrote: >> On 9 July 2012 13:07, Eric Blake wrote: >>> That is, we are filtering based on the explicit presence of a literal >>> '?' in the help output to determine whether we can further filter based >>> on '-device device,?' queries wit

Re: [Qemu-devel] [PATCH 23/25] fdc: Move floppy geometry guessing back from block.c

2012-07-09 Thread Markus Armbruster
Kevin Wolf writes: > Am 09.07.2012 17:01, schrieb Anthony Liguori: >> On 07/09/2012 09:16 AM, Kevin Wolf wrote: >>> From: Markus Armbruster >>> >>> Commit 5bbdbb46 moved it to block.c because "other geometry guessing >>> functions already

[Qemu-devel] [PATCH v3 00/29] Disk geometry cleanup

2012-07-10 Thread Markus Armbruster
Fix uninitialized variable in PATCH 02/29 (Anthony) v2: New hw/block-common.h (Blue & Kevin) Coding style here & there (Blue) Tracepoint parameter types (Stefan) Markus Armbruster (29): fdc: Move floppy geometry guessing back from block.c vvfat: Fix partition table vvfat: Do not clobb

[Qemu-devel] [PATCH v3 16/29] scsi-hd: qdev properties for disk geometry

2012-07-10 Thread Markus Armbruster
ry. scsi-block should get geometry from the host disk. Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 69 +-- 1 files changed, 46 insertions(+), 23 deletions(-) diff --git a/hw/scsi-disk.c b

[Qemu-devel] [PATCH v3 05/29] hd-geometry: Move disk geometry guessing back from block.c

2012-07-10 Thread Markus Armbruster
Commit f3d54fc4 factored it out of hw/ide.c for reuse. Sensible, except it was put into block.c. Device-specific functionality should be kept in device code, not the block layer. Move it to hw/hd-geometry.c, and make stylistic changes required to keep checkpatch.pl happy. Signed-off-by: Markus

[Qemu-devel] [PATCH v3 23/29] qtest: Cover qdev property for BIOS CHS translation

2012-07-10 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c | 13 +++-- 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index a47b945..5d9d2e4 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,15 +321,16 @@ static

[Qemu-devel] [PATCH v3 21/29] qdev: New property type chs-translation

2012-07-10 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 15 +++ hw/qdev.h|3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 002c7f9..0b18f8c 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev

[Qemu-devel] [PATCH v3 11/29] hd-geometry: Cut out block layer translation middleman

2012-07-10 Thread Markus Armbruster
the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/block-common.h |3 ++- hw/hd-geometry.c | 20 ++-- hw/ide/core.c |2 +- hw/scsi-disk.c|4 ++-- hw/virtio-blk.c |2 +- 5 files changed, 20 insertions(+), 11

[Qemu-devel] [PATCH v3 12/29] ide pc: Cut out the block layer geometry middleman

2012-07-10 Thread Markus Armbruster
PC BIOS setup needs IDE geometry information. Get it directly from the device model rather than through the block layer. In preparation of purging geometry from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/ide.h |4 +++- hw/ide

[Qemu-devel] [PATCH v3 17/29] virtio-blk: qdev properties for disk geometry

2012-07-10 Thread Markus Armbruster
Geometry needs to be qdev properties, because it belongs to the disk's guest part. Maintain backward compatibility exactly like for serial: fall back to DriveInfo's geometry, set with -drive cyls=... Bonus: info qtree now shows the geometry. Signed-off-by: Markus Armbruster --- hw/s

[Qemu-devel] [PATCH v3 10/29] hd-geometry: Clean up confusing use of prior translation hint

2012-07-10 Thread Markus Armbruster
cylinders. Since hd_geometry_guess() returns right away when it finds a valid geometry hint, translation can only be BIOS_ATA_TRANSLATION_AUTO in the remainder of the function. Assert this, and simplify accordingly. Signed-off-by: Markus Armbruster --- hw/hd-geometry.c | 17 +++-

[Qemu-devel] [PATCH v3 25/29] ide pc: Put hard disk info into CMOS only for hard disks

2012-07-10 Thread Markus Armbruster
In particular, don't set disk type and geometry when a CD-ROM on bus ide.0 has media during CMOS initialization. Signed-off-by: Markus Armbruster --- hw/ide/qdev.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index f191dd3..84

[Qemu-devel] [PATCH v3 19/29] qtest: Cover qdev properties for disk geometry

2012-07-10 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index cc447a2..a47b945 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -321,13 +321,15 @@ static void

[Qemu-devel] [PATCH v3 01/29] fdc: Move floppy geometry guessing back from block.c

2012-07-10 Thread Markus Armbruster
es. Bonus: the floppy type used in pc_cmos_init() now obviously matches the one in the FDrive. Before, we relied on bdrv_get_floppy_geometry_hint() picking the same type both in fd_revalidate() and in pc_cmos_init(). Signed-off-by: Markus Armbruster --- block

[Qemu-devel] [PATCH v3 20/29] qdev: Collect private helpers in one place

2012-07-10 Thread Markus Armbruster
Just code motion, with one long line wrapped to keep checkpatch.pl happy. Signed-off-by: Markus Armbruster --- hw/qdev-properties.c | 144 +- 1 files changed, 72 insertions(+), 72 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev

[Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match BlockConf

2012-07-10 Thread Markus Armbruster
Best to use the same type, to avoid unwanted truncation or sign extension. BlockConf can't use plain int for cyls, heads and secs, because integer properties require an exact width. Signed-off-by: Markus Armbruster --- hw/block-common.h |2 +- hw/hd-geometry.c |4 ++-- hw/ide/c

[Qemu-devel] [PATCH v3 26/29] qtest: Test we don't put hard disk info into CMOS for a CD-ROM

2012-07-10 Thread Markus Armbruster
Signed-off-by: Markus Armbruster --- tests/hd-geo-test.c | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 5d9d2e4..9a31e85 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -369,6 +369,27

<    1   2   3   4   5   6   7   8   9   10   >