Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
Ekaterina Tumanova writes:
> Signed-off-by: Ekaterina Tumanova
> ---
> hw/block/hd-geometry.c | 6 ++
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
> index b462225..905d2c6 100644
> --- a/hw/block/hd-geometry.c
> +++ b/hw/block/hd-geometry.c
> @@ -147,7 +147,8 @@ void hd_geometry_guess(BlockBackend *blk,
> uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs,
> int *ptrans)
> {
> -int cylinders, heads, secs, translation;
> +uint32_t cylinders, heads, secs;
> +int translation = BIOS_ATA_TRANSLATION_NONE;
> struct ProbeGeometry geometry = blk_probe_geometry(blk);
>
> if (geometry.rc == 0) {
> @@ -173,9 +174,6 @@ void hd_geometry_guess(BlockBackend *blk,
> *pcyls = cylinders;
> *pheads = heads;
> *psecs = secs;
> -/* disable any translation to be in sync with
> - the logical geometry */
> -translation = BIOS_ATA_TRANSLATION_NONE;
> }
Actually broken in PATCH 5, so it needs to be fixed there, and not in
PATCH 6 (which this one fixes up).
Moreover, your fixup makes the code less clear. Please add the missing
translation = ... instead.
> done:
> if (ptrans) {
Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
On 11/20/2014 07:18 PM, Kevin Wolf wrote: Am 19.11.2014 um 16:04 hat Cornelia Huck geschrieben: On Wed, 19 Nov 2014 14:40:07 + Peter Maydell wrote: On 19 November 2014 14:01, Ekaterina Tumanova wrote: Signed-off-by: Ekaterina Tumanova Could you give the compiler error/warning message, please (and the compiler version)? These changes look sensible but it's not clear to me why the current code would cause a compilation failure or why that would be specific to i386... This patch is referring to Kate's patch set "[PATCH v2 0/6] Geometry and blocksize support for backing devices", which did not compile on i386 (see <546c8161.10...@de.ibm.com>). Where does it need to be squashed in? We want to keep the tree bisectable, so breaking the build and then fixing it at the end of the series isn't an option. Kevin This is just a small -in-reply-to patch to Christian's note, fixing the patch set compilation on i386. It should be squashed into the last patch in a series: "[PATCH v2 6/6] geometry: Target specific hook for s390x in geometry guessing". I just don't want to send a new version before receiving any substantial comments. Kate.
Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
Am 20.11.2014 um 17:18 schrieb Kevin Wolf: > Am 19.11.2014 um 16:04 hat Cornelia Huck geschrieben: >> On Wed, 19 Nov 2014 14:40:07 + >> Peter Maydell wrote: >> >>> On 19 November 2014 14:01, Ekaterina Tumanova >>> wrote: Signed-off-by: Ekaterina Tumanova >>> >>> Could you give the compiler error/warning message, please >>> (and the compiler version)? >>> >>> These changes look sensible but it's not clear to me why >>> the current code would cause a compilation failure or why >>> that would be specific to i386... >> >> This patch is referring to Kate's patch set "[PATCH v2 0/6] Geometry >> and blocksize support for backing devices", which did not compile on >> i386 (see <546c8161.10...@de.ibm.com>). > > Where does it need to be squashed in? We want to keep the tree > bisectable, so breaking the build and then fixing it at the end of the > series isn't an option. I think Kate just wanted to avoid spamming the list with v3 if only one patch is fixed up when there was no review comment about the content of the series. Using the -in-reply-to option plus a comment in the patch would have avoided the confusion - I guess. Christian
Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
Am 19.11.2014 um 16:04 hat Cornelia Huck geschrieben: > On Wed, 19 Nov 2014 14:40:07 + > Peter Maydell wrote: > > > On 19 November 2014 14:01, Ekaterina Tumanova > > wrote: > > > Signed-off-by: Ekaterina Tumanova > > > > Could you give the compiler error/warning message, please > > (and the compiler version)? > > > > These changes look sensible but it's not clear to me why > > the current code would cause a compilation failure or why > > that would be specific to i386... > > This patch is referring to Kate's patch set "[PATCH v2 0/6] Geometry > and blocksize support for backing devices", which did not compile on > i386 (see <546c8161.10...@de.ibm.com>). Where does it need to be squashed in? We want to keep the tree bisectable, so breaking the build and then fixing it at the end of the series isn't an option. Kevin
Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
On Wed, 19 Nov 2014 14:40:07 + Peter Maydell wrote: > On 19 November 2014 14:01, Ekaterina Tumanova > wrote: > > Signed-off-by: Ekaterina Tumanova > > Could you give the compiler error/warning message, please > (and the compiler version)? > > These changes look sensible but it's not clear to me why > the current code would cause a compilation failure or why > that would be specific to i386... This patch is referring to Kate's patch set "[PATCH v2 0/6] Geometry and blocksize support for backing devices", which did not compile on i386 (see <546c8161.10...@de.ibm.com>).
Re: [Qemu-devel] [PATCH] geometry: fix i386 compilation
On 19 November 2014 14:01, Ekaterina Tumanova wrote: > Signed-off-by: Ekaterina Tumanova Could you give the compiler error/warning message, please (and the compiler version)? These changes look sensible but it's not clear to me why the current code would cause a compilation failure or why that would be specific to i386... thanks -- PMM
