提交 · 61999750d3df96ee3f2b111420c7d0a117e57df7 · openeuler / qemu

22 8月, 2011 18 次提交

sun4m: avoid structure holes spotted by pahole · 61999750

由 Blue Swirl 提交于 8月 07, 2011

Edited report from pahole on amd64 host:
struct sun4c_hwdef {
...
	uint8_t                    nvram_machine_id;     /*   112     1 */

	/* XXX 1 byte hole, try to pack */
...
	/* size: 136, cachelines: 3 */
	/* sum members: 135, holes: 1, sum holes: 1 */
	/* last cacheline: 8 bytes */
};	/* definitions: 1 */

struct sun4d_hwdef {
...
	uint8_t                    nvram_machine_id;     /*   128     1 */

	/* XXX 1 byte hole, try to pack */
...
	/* size: 152, cachelines: 3 */
	/* sum members: 151, holes: 1, sum holes: 1 */
	/* last cacheline: 24 bytes */
};	/* definitions: 1 */

struct sun4m_hwdef {
...
	uint8_t                    nvram_machine_id;     /*   260     1 */

	/* XXX 1 byte hole, try to pack */

	uint16_t                   machine_id;           /*   262     2 */
	uint32_t                   iommu_version;        /*   264     4 */

	/* XXX 4 bytes hole, try to pack */
...
	/* size: 288, cachelines: 5 */
	/* sum members: 283, holes: 2, sum holes: 5 */
	/* last cacheline: 32 bytes */
};	/* definitions: 1 */

Fix by rearranging the structures to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

61999750

tcx: avoid structure holes spotted by pahole · 427a66c3

由 Blue Swirl 提交于 8月 07, 2011

Report from pahole on amd64 host:
struct TCXState {
	SysBusDevice               busdev;               /*     0  5648 */
	/* --- cacheline 88 boundary (5632 bytes) was 16 bytes ago --- */
	target_phys_addr_t         addr;                 /*  5648     8 */
	DisplayState *             ds;                   /*  5656     8 */
	uint8_t *                  vram;                 /*  5664     8 */
	uint32_t *                 vram24;               /*  5672     8 */
	uint32_t *                 cplane;               /*  5680     8 */
	ram_addr_t                 vram_offset;          /*  5688     8 */
	/* --- cacheline 89 boundary (5696 bytes) --- */
	ram_addr_t                 vram24_offset;        /*  5696     8 */
	ram_addr_t                 cplane_offset;        /*  5704     8 */
	uint32_t                   vram_size;            /*  5712     4 */
	uint16_t                   width;                /*  5716     2 */
	uint16_t                   height;               /*  5718     2 */
	uint16_t                   depth;                /*  5720     2 */
	uint8_t                    r[256];               /*  5722   256 */
	/* --- cacheline 93 boundary (5952 bytes) was 26 bytes ago --- */
	uint8_t                    g[256];               /*  5978   256 */
	/* --- cacheline 97 boundary (6208 bytes) was 26 bytes ago --- */
	uint8_t                    b[256];               /*  6234   256 */

	/* XXX 2 bytes hole, try to pack */

	/* --- cacheline 101 boundary (6464 bytes) was 28 bytes ago --- */
	uint32_t                   palette[256];         /*  6492  1024 */
	/* --- cacheline 117 boundary (7488 bytes) was 28 bytes ago --- */
	uint8_t                    dac_index;            /*  7516     1 */
	uint8_t                    dac_state;            /*  7517     1 */

	/* size: 7520, cachelines: 118 */
	/* sum members: 7516, holes: 1, sum holes: 2 */
	/* padding: 2 */
	/* last cacheline: 32 bytes */
};	/* definitions: 1 */

Fix by rearranging the structure to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

427a66c3

sun4m_iommu: avoid structure holes spotted by pahole · 149e1ea1

由 Blue Swirl 提交于 8月 07, 2011

Report from pahole on amd64 host:
struct IOMMUState {
	SysBusDevice               busdev;               /*     0  5648 */
	/* --- cacheline 88 boundary (5632 bytes) was 16 bytes ago --- */
	uint32_t                   regs[4096];           /*  5648 16384 */
	/* --- cacheline 344 boundary (22016 bytes) was 16 bytes ago --- */
	target_phys_addr_t         iostart;              /* 22032     8 */
	uint32_t                   version;              /* 22040     4 */

	/* XXX 4 bytes hole, try to pack */

	qemu_irq                   irq;                  /* 22048     8 */

	/* size: 22056, cachelines: 345 */
	/* sum members: 22052, holes: 1, sum holes: 4 */
	/* last cacheline: 40 bytes */
};	/* definitions: 1 */

Fix by rearranging the structure to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

149e1ea1

slavio_intctl: avoid structure holes spotted by pahole · 07dd0035

由 Blue Swirl 提交于 8月 07, 2011

Report from pahole on amd64 host:
struct SLAVIO_INTCTLState {
	SysBusDevice               busdev;               /*     0  5648 */
	/* --- cacheline 88 boundary (5632 bytes) was 16 bytes ago --- */
	uint32_t                   intregm_pending;      /*  5648     4 */
	uint32_t                   intregm_disabled;     /*  5652     4 */
	uint32_t                   target_cpu;           /*  5656     4 */

	/* XXX 4 bytes hole, try to pack */

	qemu_irq                   cpu_irqs[16][16];     /*  5664  2048 */
	/* --- cacheline 120 boundary (7680 bytes) was 32 bytes ago --- */
	SLAVIO_CPUINTCTLState      slaves[16];           /*  7712   384 */
	/* --- cacheline 126 boundary (8064 bytes) was 32 bytes ago --- */

	/* size: 8096, cachelines: 127 */
	/* sum members: 8092, holes: 1, sum holes: 4 */
	/* last cacheline: 32 bytes */
};	/* definitions: 1 */

struct SLAVIO_CPUINTCTLState {
	uint32_t                   intreg_pending;       /*     0     4 */

	/* XXX 4 bytes hole, try to pack */

	struct SLAVIO_INTCTLState * master;              /*     8     8 */
	uint32_t                   cpu;                  /*    16     4 */
	uint32_t                   irl_out;              /*    20     4 */

	/* size: 24, cachelines: 1 */
	/* sum members: 20, holes: 1, sum holes: 4 */
	/* last cacheline: 24 bytes */
};	/* definitions: 1 */

Fix by rearranging the structures to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

07dd0035

slavio_misc: avoid structure holes spotted by pahole · 97bbb109

由 Blue Swirl 提交于 8月 07, 2011

Report from pahole on amd64 host:
struct MiscState {
	SysBusDevice               busdev;               /*     0  5648 */
	/* --- cacheline 88 boundary (5632 bytes) was 16 bytes ago --- */
	qemu_irq                   irq;                  /*  5648     8 */
	uint32_t                   dummy;                /*  5656     4 */
	uint8_t                    config;               /*  5660     1 */
	uint8_t                    aux1;                 /*  5661     1 */
	uint8_t                    aux2;                 /*  5662     1 */
	uint8_t                    diag;                 /*  5663     1 */
	uint8_t                    mctrl;                /*  5664     1 */
	uint8_t                    sysctrl;              /*  5665     1 */
	uint16_t                   leds;                 /*  5666     2 */

	/* XXX 4 bytes hole, try to pack */

	qemu_irq                   fdc_tc;               /*  5672     8 */

	/* size: 5680, cachelines: 89 */
	/* sum members: 5676, holes: 1, sum holes: 4 */
	/* last cacheline: 48 bytes */
};	/* definitions: 1 */

Fix by rearranging the structure to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

97bbb109

slavio_timer: avoid structure holes spotted by pahole · f90074f4

由 Blue Swirl 提交于 8月 07, 2011

Report from pahole on amd64 host:
struct SLAVIO_TIMERState {
	SysBusDevice               busdev;               /*     0  5648 */
	/* --- cacheline 88 boundary (5632 bytes) was 16 bytes ago --- */
	uint32_t                   num_cpus;             /*  5648     4 */

	/* XXX 4 bytes hole, try to pack */

	CPUTimerState              cputimer[17];         /*  5656   816 */
	/* --- cacheline 101 boundary (6464 bytes) was 8 bytes ago --- */
	uint32_t                   cputimer_mode;        /*  6472     4 */

	/* size: 6480, cachelines: 102 */
	/* sum members: 6472, holes: 1, sum holes: 4 */
	/* padding: 4 */
	/* last cacheline: 16 bytes */
};	/* definitions: 1 */

struct CPUTimerState {
	qemu_irq                   irq;                  /*     0     8 */
	ptimer_state *             timer;                /*     8     8 */
	uint32_t                   count;                /*    16     4 */
	uint32_t                   counthigh;            /*    20     4 */
	uint32_t                   reached;              /*    24     4 */

	/* XXX 4 bytes hole, try to pack */

	uint64_t                   limit;                /*    32     8 */
	uint32_t                   running;              /*    40     4 */

	/* size: 48, cachelines: 1 */
	/* sum members: 40, holes: 1, sum holes: 4 */
	/* padding: 4 */
	/* last cacheline: 48 bytes */
};	/* definitions: 1 */

Fix by rearranging the structures to avoid padding.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

f90074f4

monitor: Prevent sign-extension of 32-bit addresses printed by info tlb · 94ac5cd2

由 Austin Clements 提交于 8月 21, 2011

This is the same fix that was recently applied to info mem.  Before
this change, info tlb output looked like:

ffffffffffffc000: 000000000fffc000 --------W
ffffffffffffd000: 000000000fffd000 --------W
ffffffffffffe000: 000000000fffe000 --------W
fffffffffffff000: 000000000ffff000 --------W

With this change, it looks like

00000000ffffc000: 000000000fffc000 --------W
00000000ffffd000: 000000000fffd000 --------W
00000000ffffe000: 000000000fffe000 --------W
00000000fffff000: 000000000ffff000 --------W
Signed-off-by: NAustin Clements <amdragon@mit.edu>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

94ac5cd2

B
Merge branch 'queues/slirp' of git://git.kiszka.org/qemu · aec7c6dc
由 Blue Swirl 提交于 8月 21, 2011
```
* 'queues/slirp' of git://git.kiszka.org/qemu:
  slirp: Fix bit field types in IP header structs
```
aec7c6dc
R
tcg-ia64: Fix typos in AREG0 setup in prologue. · 64ba39af
由 Richard Henderson 提交于 8月 17, 2011
```
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
```
64ba39af

tcg-hppa: Fix CPU_TEMP_BUF_NLONGS oversight. · 6e6a9924

由 Richard Henderson 提交于 8月 17, 2011

Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

6e6a9924

R
tcg: Constant fold neg, andc, orc, eqv, nand, nor. · cb25c80a
由 Richard Henderson 提交于 8月 17, 2011
```
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
```
cb25c80a

tcg: Always define all of the TCGOpcode enum members. · 25c4d9cc

由 Richard Henderson 提交于 8月 17, 2011

By always defining these symbols, we can eliminate a lot of ifdefs.

To allow this to be checked reliably, the semantics of the
TCG_TARGET_HAS_* macros must be changed from def/undef to true/false.
This allows even more ifdefs to be removed, converting them into
C if statements.
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

25c4d9cc

tcg: Add and use TCG_OPF_64BIT. · 8399ad59

由 Richard Henderson 提交于 8月 17, 2011

This allows the simplification of the op_bits function from
tcg/optimize.c.
Signed-off-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

8399ad59

Check for presence of compiler -pthread flag. · 4b29ec41

由 Brad 提交于 8月 07, 2011

OpenBSD / FreeBSD and some other OS's require the use of
cc -pthread to link threaded programs so have QEMU's
configure script check for the presence of the flag
and use it if so.
Signed-off-by: NBrad Smith <brad@comstyle.com>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

4b29ec41

B
Convert last qemu_free and qemu_malloc uses · 58a06675
由 Blue Swirl 提交于 8月 21, 2011
```
7267c094 missed
a few cases, fix them.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
```
58a06675

monitor: Show combined protection bits in "info mem" · c76c8416

由 Austin Clements 提交于 8月 14, 2011

Previously, "info mem" considered and displayed only the last-level
protection bits for a memory range, which doesn't accurrately
represent the protection of that range.  Now it shows the combined
protection.
Signed-off-by: NAustin Clements <amdragon@mit.edu>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

c76c8416

monitor: Fix "info mem" to print the last memory range · 8a94b8ca

由 Austin Clements 提交于 8月 14, 2011

"info mem" groups its output into contiguous ranges with identical
protection bits, but previously forgot to print the last range.
Signed-off-by: NAustin Clements <amdragon@mit.edu>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

8a94b8ca

monitor: Prevent sign-extension of 32-bit addresses printed by info mem · b49ca72d

由 Austin Clements 提交于 8月 14, 2011

Previously, on 32-bit i386, info mem used signed 32-bit int's to store
the page table indexes.  As a result, address calculation was done in
32 bits and then incorrectly sign-extended to 64 bits, yielding output
like

ffffffffef000000-ffffffffef031000 0000000000031000 ur-
ffffffffef7bc000-ffffffffef7bd000 0000000000001000 urw
ffffffffef7bd000-ffffffffef7be000 0000000000001000 ur-

This makes these indexes unsigned, which yields correct output

00000000ef000000-00000000ef031000 0000000000031000 ur-
00000000ef7bc000-00000000ef7bd000 0000000000001000 urw
00000000ef7bd000-00000000ef7be000 0000000000001000 ur-
Signed-off-by: NAustin Clements <amdragon@mit.edu>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

b49ca72d

21 8月, 2011 10 次提交

w32: Fix format string regression · 59ad3403

由 Stefan Weil 提交于 7月 15, 2011

Commit 953ffe0f
introduced FMT_pid which is wrong for w32 and w64 getpid():
those getpid() implementations always return an int value.
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

59ad3403

w64: Add definition of FMT_pid · 0e0167ba

由 Stefan Weil 提交于 7月 15, 2011

For mingw-w64, pid_t is _pid_t which is __int64,
so this platform needs its own definition of FMT_pid.
Reviewed-by: NAndreas Färber <andreas.faerber@web.de>
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

0e0167ba

Fix conversions from pointer to tcg_target_long · 3feaca9e

由 Stefan Weil 提交于 7月 15, 2011

tcg_gen_exit_tb takes a parameter of type tcg_target_long,
so the type casts of pointer to long should be replaced by
type casts of pointer to tcg_target_long.

These changes are needed for build environments where
sizeof(long) != sizeof(void *), especially for w64.

See 4b4a72e5 which fixed the
same issue for the other targets.

Cc: Alexander Graf <agraf@suse.de>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Guan Xuetao<gxt@mprc.pku.edu.cn>
Acked-by: NAlexander Graf <agraf@suse.de>
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

3feaca9e

Remove remenants of qemu_malloc · 92f562ec

由 Anthony Liguori 提交于 8月 21, 2011

This covers the various check commands
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

92f562ec

A
Update HACKING to refer to g_malloc instead of qemu_malloc · 145e21db
由 Anthony Liguori 提交于 8月 21, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
145e21db
A
Add trace points for g_malloc/g_free functions · 0750112a
由 Anthony Liguori 提交于 8月 20, 2011
```
Derived from a patch submitted by Avi Kivity.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
0750112a
A
Remove qemu_malloc/qemu_free · 41a74826
由 Anthony Liguori 提交于 8月 20, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
41a74826

Use glib memory allocation and free functions · 7267c094

由 Anthony Liguori 提交于 8月 20, 2011

qemu_malloc/qemu_free no longer exist after this commit.
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

7267c094

A
Make glib mandatory and fixup utils appropriately · 14015304
由 Anthony Liguori 提交于 8月 20, 2011
```
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
14015304

Reorder default ram_size initialization · 0ac543de

由 Jan Kiszka 提交于 8月 15, 2011

code_gen_alloc depends on it, and that is now called earlier via
configure_accelerator.
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: NEdgar E. Iglesias <edgar.iglesias@gmail.com>

0ac543de

20 8月, 2011 2 次提交

scsi-disk: fix DPRINTF · 02fa69b6

由 Blue Swirl 提交于 8月 20, 2011

The variable 'status' does not exist anymore, adjust DPRINTF
accordingly.
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

02fa69b6

target-cris/opcode-cris.h: rename REG_PC/SP to CRIS_REG_PC/SP · 871708bf

由 Peter Maydell 提交于 8月 20, 2011

The REG_PC constant used in opcode-cris.h can clash with a
similar define in system include files. In particular the
Ubuntu Lucid SPARC signal.h will define REG_PC, and since
qemu-common.h now includes signal.h this was causing compile
failures. Rename the constants to avoid this issue.
(NB that REG_SP is not actually used within QEMU.)
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: NEdgar E. Iglesias <edgar.iglesias@gmail.com>

871708bf

17 8月, 2011 1 次提交

scsi: do not overwrite memory on REQUEST SENSE commands with a large buffer · 8b2a04ee

由 Paolo Bonzini 提交于 8月 14, 2011

Other scsi_target_reqops commands were careful about not using r->cmd.xfer
directly, and instead always cap it to a fixed length.  This was not done
for REQUEST SENSE, and this patch fixes it.
Reported-by: NBlue Swirl <blauwirbel@gmail.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

8b2a04ee

15 8月, 2011 2 次提交

slirp: Fix bit field types in IP header structs · 1b930bfa

由 Jan Kiszka 提交于 8月 06, 2011

-mms-bitfields prevents that the bitfields in current IP header structs
are packed into a single byte as it is required. Fix this by using
uint8_t as backing type.
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>

1b930bfa

hw/scsi-bus.c: Fix use of uninitialised variable · 3b6ffe50

由 Peter Maydell 提交于 8月 12, 2011

Don't use req before it has been initialised in scsi_req_new().
This fixes a compile failure due to gcc complaining about this.
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Acked-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>

3b6ffe50

12 8月, 2011 7 次提交

qapi: fix build issue due to missing newline in generated header · 7534ba01

由 Michael Roth 提交于 8月 10, 2011

Fixes a build issue on RHEL5, and potentially other distros, where gcc
will generate an error due to us not writing a trailing "\n" when
generating *qmp-commands.h
Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

7534ba01

memory: correct documentation typos · 7075ba30

由 Avi Kivity 提交于 8月 08, 2011

Noted by Drew Jones.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

7075ba30

memory: add API for creating ROM/device regions · d0a9b5bc

由 Avi Kivity 提交于 8月 08, 2011

ROM/device regions act as mapped RAM for reads, can I/O memory for
writes.  This allow emulation of flash devices.
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d0a9b5bc

A
memory: reclaim resources when a memory region is destroyed for good · 545e92e0
由 Avi Kivity 提交于 8月 08, 2011
```
Signed-off-by: NAvi Kivity <avi@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
```
545e92e0

build: Move QEMU_INCLUDES before QEMU_CFLAGS · 76dc3cf8

由 Jiri Denemark 提交于 8月 10, 2011

This patch fixes build when any of the include paths from QEMU_CFLAGS
contains a header file with similar name to a header file in qemu
sources. I hit it with error.h included by qapi/qapi-types-core.h. GCC
decided to use /usr/include/alsa/error.h instead of qemu's error.h.
Tested-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: NJiri Denemark <jdenemar@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

76dc3cf8

configure: Disable guest_agent for mingw32 · 83b2f0a0

由 Stefan Weil 提交于 8月 06, 2011

guest_agent is not supported for mingw32, so the default value
should be 'no', not 'yes'.

This removes the dependencies to glib-2.0 and python which
makes native and cross builds for w32 much easier (no need
to get and install these extra packages).

It also avoids the problems caused by different bitfield alignment
which is required by glib-2.0.

It is still possible to set guest_agent=yes via configure option.
Signed-off-by: NStefan Weil <weil@mail.berlios.de>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

83b2f0a0

scsi: add special traces for common commands · 98254542

由 Paolo Bonzini 提交于 8月 03, 2011

Can be useful when debugging the device scan phase.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

98254542