ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pSeries: Clean up write-only variables 

A few pieces of the pSeries emulation code have variables which are set
but never used, which causes warnings on gcc 4.6.  This patch removes
these instances.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
David Gibson 2011-05-17 16:47:04 +10:00 committed by Alexander Graf
parent 6d42fb313b
commit 1235a9cf17
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/spapr_hcall.c
View File

@ -100,22 +100,18 @@ static target_ulong h_enter(CPUState *env, sPAPREnvironment *spapr,
target_ulong pte_index = args[1]; target_ulong pte_index = args[1];
target_ulong pteh = args[2]; target_ulong pteh = args[2];
target_ulong ptel = args[3]; target_ulong ptel = args[3];
target_ulong porder; target_ulong i;
target_ulong i, pa;
uint8_t *hpte; uint8_t *hpte;
/* only handle 4k and 16M pages for now */ /* only handle 4k and 16M pages for now */
porder = 12;
if (pteh & HPTE_V_LARGE) { if (pteh & HPTE_V_LARGE) {
#if 0 /* We don't support 64k pages yet */ #if 0 /* We don't support 64k pages yet */
if ((ptel & 0xf000) == 0x1000) { if ((ptel & 0xf000) == 0x1000) {
/* 64k page */ /* 64k page */
porder = 16;
} else } else
#endif #endif
if ((ptel & 0xff000) == 0) { if ((ptel & 0xff000) == 0) {
/* 16M page */ /* 16M page */
porder = 24;
/* lowest AVA bit must be 0 for 16M pages */ /* lowest AVA bit must be 0 for 16M pages */
if (pteh & 0x80) { if (pteh & 0x80) {
return H_PARAMETER; return H_PARAMETER;
@ -125,7 +121,6 @@ static target_ulong h_enter(CPUState *env, sPAPREnvironment *spapr,
} }
} }
pa = ptel & HPTE_R_RPN;
/* FIXME: bounds check the pa? */ /* FIXME: bounds check the pa? */
/* Check WIMG */ /* Check WIMG */

3
hw/spapr_llan.c
View File

@ -185,9 +185,6 @@ static NetClientInfo net_spapr_vlan_info = {
static int spapr_vlan_init(VIOsPAPRDevice *sdev) static int spapr_vlan_init(VIOsPAPRDevice *sdev)
{ {
VIOsPAPRVLANDevice *dev = (VIOsPAPRVLANDevice *)sdev; VIOsPAPRVLANDevice *dev = (VIOsPAPRVLANDevice *)sdev;
VIOsPAPRBus *bus;
bus = DO_UPCAST(VIOsPAPRBus, bus, sdev->qdev.parent_bus);
qemu_macaddr_default_if_unset(&dev->nicconf.macaddr); qemu_macaddr_default_if_unset(&dev->nicconf.macaddr);