Patchwork [01/24] user: move *-user/qemu-types.h to main directory

login
register
mail settings
Submitter Eduardo Habkost
Date Nov. 9, 2012, 2:56 p.m.
Message ID <1352473012-20500-2-git-send-email-ehabkost@redhat.com>
Download mbox | patch
Permalink /patch/198116/
State New
Headers show

Comments

Eduardo Habkost - Nov. 9, 2012, 2:56 p.m.
The bsd-user/qemu-types.h and linux-user/qemu-types.h files are almost
the same, but linux-user have the additional definitions of tswapal().

This moves the linux-user file to the main directory, so the same file
can be used by linux-user and bsd-user.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Riku Voipio <riku.voipio@iki.fi>
---
 bsd-user/qemu-types.h                   | 24 ------------------------
 linux-user/qemu-types.h => qemu-types.h |  0
 2 files changed, 24 deletions(-)
 delete mode 100644 bsd-user/qemu-types.h
 rename linux-user/qemu-types.h => qemu-types.h (100%)

diff --git a/linux-user/qemu-types.h b/qemu-types.h
similarity index 100%
rename from linux-user/qemu-types.h
rename to qemu-types.h
Andreas Färber - Nov. 12, 2012, 9:38 p.m.
Am 09.11.2012 15:56, schrieb Eduardo Habkost:
> The bsd-user/qemu-types.h and linux-user/qemu-types.h files are almost
> the same, but linux-user have the additional definitions of tswapal().
> 
> This moves the linux-user file to the main directory, so the same file
> can be used by linux-user and bsd-user.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

A quick diff -u confirms that this is (still) the case. I had suggested
unifying these files long time ago when I tried fixing darwin-user, but
hit resistance in favor of having the *-users separate. I'm still in
favor of not duplicating identical code, so

Acked-by: Andreas Färber <afaerber@suse.de>

Riku, do you agree?

Andreas
Blue Swirl - Nov. 17, 2012, 4:02 p.m.
On Mon, Nov 12, 2012 at 9:38 PM, Andreas Färber <afaerber@suse.de> wrote:
> Am 09.11.2012 15:56, schrieb Eduardo Habkost:
>> The bsd-user/qemu-types.h and linux-user/qemu-types.h files are almost
>> the same, but linux-user have the additional definitions of tswapal().
>>
>> This moves the linux-user file to the main directory, so the same file
>> can be used by linux-user and bsd-user.
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>
> A quick diff -u confirms that this is (still) the case. I had suggested
> unifying these files long time ago when I tried fixing darwin-user, but
> hit resistance in favor of having the *-users separate. I'm still in
> favor of not duplicating identical code, so

The problem in general with merging user emulator code is that the
changes may cause regressions since there are subtle differences. In
this specific case it should be OK.

>
> Acked-by: Andreas Färber <afaerber@suse.de>
>
> Riku, do you agree?
>
> Andreas
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Patch

diff --git a/bsd-user/qemu-types.h b/bsd-user/qemu-types.h
deleted file mode 100644
index 1adda9f..0000000
--- a/bsd-user/qemu-types.h
+++ /dev/null
@@ -1,24 +0,0 @@ 
-#ifndef QEMU_TYPES_H
-#define QEMU_TYPES_H
-#include "cpu.h"
-
-#ifdef TARGET_ABI32
-typedef uint32_t abi_ulong;
-typedef int32_t abi_long;
-#define TARGET_ABI_FMT_lx "%08x"
-#define TARGET_ABI_FMT_ld "%d"
-#define TARGET_ABI_FMT_lu "%u"
-#define TARGET_ABI_BITS 32
-#else
-typedef target_ulong abi_ulong;
-typedef target_long abi_long;
-#define TARGET_ABI_FMT_lx TARGET_FMT_lx
-#define TARGET_ABI_FMT_ld TARGET_FMT_ld
-#define TARGET_ABI_FMT_lu TARGET_FMT_lu
-#define TARGET_ABI_BITS TARGET_LONG_BITS
-/* for consistency, define ABI32 too */
-#if TARGET_ABI_BITS == 32
-#define TARGET_ABI32 1
-#endif
-#endif
-#endif