Skip to content

Commit dd9cb79

Browse files
committed
Upstream: integrate minor cleanups
Change-Id: I8de8e1044794f0ef8427717fc0b3b5e9e121247b
1 parent a7fb77d commit dd9cb79

10 files changed

+147
-59
lines changed

Changelog

+70
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,73 @@
1+
version 0.12.0:
2+
3+
- Update to SeaBIOS 0.5.0
4+
- e1000: fix device link status in Linux (Anthony Liguori)
5+
- monitor: fix QMP for balloon command (Luiz Capitulino)
6+
- QMP: Return an empty dict by default (Luiz Capitulino)
7+
- QMP: Only handle converted commands (Luiz Capitulino)
8+
- pci: support PCI based option rom loading (Gerd Hoffman/Anthony Liguori)
9+
- Fix backcompat for hotplug of SCSI controllers (Daniel P. Berrange)
10+
- fdc: fix migration from 0.11 (Juan Quintela)
11+
- vmware-vga: fix segv on cursor resize. (Dave Airlie)
12+
- vmware-vga: various fixes (Dave Airlie/Anthony Liguori)
13+
- qdev: improve property error reporting. (Gerd Hoffmann)
14+
- fix vga names in default_list (Gerd Hoffmann)
15+
- usb-host: check mon before using it. (Gerd Hoffmann)
16+
- usb-net: use qdev for -usbdevice (Gerd Hoffmann)
17+
- monitor: Catch printing to non-existent monitor (Luiz Capitulino)
18+
- Avoid permanently disabled QEMU monitor when UNIX migration fails (Daniel P. Berrange)
19+
- Fix loading of ELF multiboot kernels (Kevin Wolf)
20+
- qemu-io: Fix memory leak (Kevin Wolf)
21+
- Fix thinko in linuxboot.S (Paolo Bonzini)
22+
- target-i386: Fix evaluation of DR7 register (Jan Kiszka)
23+
- vnc: hextile: do not generate ForegroundSpecified and SubrectsColoured tiles (Anthony Liguori)
24+
- S390: Bail out without KVM (Alexander Graf)
25+
- S390: Don't tell guest we're updating config space (Alexander Graf)
26+
- target-s390: Fail on unknown instructions (Alexander Graf)
27+
- osdep: Fix runtime failure on older Linux kernels (Andre Przywara)
28+
- Fix a make -j race (Juergen Lock)
29+
- target-alpha: Fix generic ctz64. (Richard Henderson)
30+
- s390: Fix buggy assignment (Stefan Weil)
31+
- target-mips: fix user-mode emulation startup (Nathan Froyd)
32+
- target-i386: Update CPUID feature set for TCG (Andre Przywara)
33+
- s390: fix build on 32 bit host (Michael S. Tsirkin)
34+
35+
version 0.12.0-rc2:
36+
37+
- v2: properly save kvm system time msr registers (Glauber Costa)
38+
- convert more monitor commands to qmp (Luiz Capitulino)
39+
- vnc: fix capslock tracking logic. (Gerd Hoffmann)
40+
- QemuOpts: allow larger option values. (Gerd Hoffmann)
41+
- scsi: fix drive hotplug. (Gerd Hoffmann)
42+
- pci: don't hw_error() when no slot is available. (Gerd Hoffmann)
43+
- pci: don't abort() when trying to hotplug with acpi off. (Gerd Hoffmann)
44+
- allow default devices to be implemented in config file (Gerd Hoffman)
45+
- vc: colorize chardev title line with blue background. (Gerd Hoffmann)
46+
- chardev: make chardevs specified in config file work. (Gerd Hoffmann)
47+
- qdev: also match bus name for global properties (Gerd Hoffmann)
48+
- qdev: add command line option to set global defaults for properties. (Gerd Hoffmann)
49+
- kvm: x86: Save/restore exception_index (Jan Kiszka)
50+
- qdev: Replace device names containing whitespace (Markus Armbruster)
51+
- fix rtc-td-hack on host without high-res timers (Gleb Natapov)
52+
- virtio: verify features on load (Michael S. Tsirkin)
53+
- vmware_vga: add rom file so that it boots. (Dave Airlie)
54+
- Do not abort on qemu_malloc(0) in production builds (Anthony Liguori)
55+
- Fix ARM userspace strex implementation. (Paul Brook)
56+
- qemu: delete rule target on error (Michael S. Tsirkin)
57+
- QMP: add human-readable description to error response (Markus Armbruster)
58+
- convert more monitor commands to QError (Markus Armbruster)
59+
- monitor: Fix double-prompt after "change vnc passwd BLA" (Markus Armbruster)
60+
- monitor: do_cont(): Don't ask for passwords (Luiz Capitulino)
61+
- monitor: Introduce 'block_passwd' command (Luiz Capitulino)
62+
- pci: interrupt disable bit support (Michael S. Tsirkin)
63+
- pci: interrupt status bit implementation (Michael S. Tsirkin)
64+
- pci: prepare irq code for interrupt state (Michael S. Tsirkin)
65+
- msix: function mask support (Michael S. Tsirkin)
66+
- msix: macro rename for function mask support (Michael S. Tsirkin)
67+
- cpuid: Fix multicore setup on Intel (Andre Przywara)
68+
- kvm: x86: Fix initial kvm_has_msr_star (Jan Kiszka)
69+
- Update OpenBIOS images to r640 (Aurelien Jarno)
70+
171
version 0.10.2:
272

373
- fix savevm/loadvm (Anthony Liguori)

arm-dis.c

+30-33
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
more details.
1818
1919
You should have received a copy of the GNU General Public License
20-
along with this program; if not, write to the Free Software
21-
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
20+
along with this program; if not, see <http://www.gnu.org/licenses/>. */
2221

2322
/* Start of qemu specific additions. Mostly this is stub definitions
2423
for things we don't care about. */
2524

2625
#include "dis-asm.h"
27-
#define FALSE 0
28-
#define TRUE (!FALSE)
2926
#define ATTRIBUTE_UNUSED __attribute__((unused))
3027
#define ISSPACE(x) ((x) == ' ' || (x) == '\t' || (x) == '\n')
3128

@@ -1532,7 +1529,7 @@ static unsigned int regname_selected = 1;
15321529
#define NUM_ARM_REGNAMES NUM_ELEM (regnames)
15331530
#define arm_regnames regnames[regname_selected].reg_names
15341531

1535-
static bfd_boolean force_thumb = FALSE;
1532+
static bfd_boolean force_thumb = false;
15361533

15371534
/* Current IT instruction state. This contains the same state as the IT
15381535
bits in the CPSR. */
@@ -1629,7 +1626,7 @@ arm_decode_shift (long given, fprintf_ftype func, void *stream,
16291626
}
16301627

16311628
/* Print one coprocessor instruction on INFO->STREAM.
1632-
Return TRUE if the instuction matched, FALSE if this is not a
1629+
Return true if the instuction matched, false if this is not a
16331630
recognised coprocessor instruction. */
16341631

16351632
static bfd_boolean
@@ -2122,10 +2119,10 @@ print_insn_coprocessor (bfd_vma pc, struct disassemble_info *info, long given,
21222119
else
21232120
func (stream, "%c", *c);
21242121
}
2125-
return TRUE;
2122+
return true;
21262123
}
21272124
}
2128-
return FALSE;
2125+
return false;
21292126
}
21302127

21312128
static void
@@ -2219,7 +2216,7 @@ print_arm_address (bfd_vma pc, struct disassemble_info *info, long given)
22192216
}
22202217

22212218
/* Print one neon instruction on INFO->STREAM.
2222-
Return TRUE if the instuction matched, FALSE if this is not a
2219+
Return true if the instuction matched, false if this is not a
22232220
recognised neon instruction. */
22242221

22252222
static bfd_boolean
@@ -2245,7 +2242,7 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
22452242
else if ((given & 0xff000000) == 0xf9000000)
22462243
given ^= 0xf9000000 ^ 0xf4000000;
22472244
else
2248-
return FALSE;
2245+
return false;
22492246
}
22502247

22512248
for (insn = neon_opcodes; insn->assembler; insn++)
@@ -2335,34 +2332,34 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
23352332
{
23362333
int amask = (1 << size) - 1;
23372334
if ((idx_align & (1 << size)) != 0)
2338-
return FALSE;
2335+
return false;
23392336
if (size > 0)
23402337
{
23412338
if ((idx_align & amask) == amask)
23422339
align = 8 << size;
23432340
else if ((idx_align & amask) != 0)
2344-
return FALSE;
2341+
return false;
23452342
}
23462343
}
23472344
break;
23482345

23492346
case 2:
23502347
if (size == 2 && (idx_align & 2) != 0)
2351-
return FALSE;
2348+
return false;
23522349
align = (idx_align & 1) ? 16 << size : 0;
23532350
break;
23542351

23552352
case 3:
23562353
if ((size == 2 && (idx_align & 3) != 0)
23572354
|| (idx_align & 1) != 0)
2358-
return FALSE;
2355+
return false;
23592356
break;
23602357

23612358
case 4:
23622359
if (size == 2)
23632360
{
23642361
if ((idx_align & 3) == 3)
2365-
return FALSE;
2362+
return false;
23662363
align = (idx_align & 3) * 64;
23672364
}
23682365
else
@@ -2671,10 +2668,10 @@ print_insn_neon (struct disassemble_info *info, long given, bfd_boolean thumb)
26712668
else
26722669
func (stream, "%c", *c);
26732670
}
2674-
return TRUE;
2671+
return true;
26752672
}
26762673
}
2677-
return FALSE;
2674+
return false;
26782675
}
26792676

26802677
/* Print one ARM instruction from PC on INFO->STREAM. */
@@ -2686,10 +2683,10 @@ print_insn_arm_internal (bfd_vma pc, struct disassemble_info *info, long given)
26862683
void *stream = info->stream;
26872684
fprintf_ftype func = info->fprintf_func;
26882685

2689-
if (print_insn_coprocessor (pc, info, given, FALSE))
2686+
if (print_insn_coprocessor (pc, info, given, false))
26902687
return;
26912688

2692-
if (print_insn_neon (info, given, FALSE))
2689+
if (print_insn_neon (info, given, false))
26932690
return;
26942691

26952692
for (insn = arm_opcodes; insn->assembler; insn++)
@@ -3322,10 +3319,10 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
33223319
void *stream = info->stream;
33233320
fprintf_ftype func = info->fprintf_func;
33243321

3325-
if (print_insn_coprocessor (pc, info, given, TRUE))
3322+
if (print_insn_coprocessor (pc, info, given, true))
33263323
return;
33273324

3328-
if (print_insn_neon (info, given, TRUE))
3325+
if (print_insn_neon (info, given, true))
33293326
return;
33303327

33313328
for (insn = thumb32_opcodes; insn->assembler; insn++)
@@ -3460,7 +3457,7 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
34603457
unsigned int op = (given & 0x00000f00) >> 8;
34613458
unsigned int i12 = (given & 0x00000fff);
34623459
unsigned int i8 = (given & 0x000000ff);
3463-
bfd_boolean writeback = FALSE, postind = FALSE;
3460+
bfd_boolean writeback = false, postind = false;
34643461
int offset = 0;
34653462

34663463
func (stream, "[%s", arm_regnames[Rn]);
@@ -3490,22 +3487,22 @@ print_insn_thumb32 (bfd_vma pc, struct disassemble_info *info, long given)
34903487

34913488
case 0xF: /* 8-bit + preindex with wb */
34923489
offset = i8;
3493-
writeback = TRUE;
3490+
writeback = true;
34943491
break;
34953492

34963493
case 0xD: /* 8-bit - preindex with wb */
34973494
offset = -i8;
3498-
writeback = TRUE;
3495+
writeback = true;
34993496
break;
35003497

35013498
case 0xB: /* 8-bit + postindex */
35023499
offset = i8;
3503-
postind = TRUE;
3500+
postind = true;
35043501
break;
35053502

35063503
case 0x9: /* 8-bit - postindex */
35073504
offset = -i8;
3508-
postind = TRUE;
3505+
postind = true;
35093506
break;
35103507

35113508
default:
@@ -3878,12 +3875,12 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
38783875
unsigned char b[4];
38793876
long given;
38803877
int status;
3881-
int is_thumb = FALSE;
3882-
int is_data = FALSE;
3878+
int is_thumb = false;
3879+
int is_data = false;
38833880
unsigned int size = 4;
38843881
void (*printer) (bfd_vma, struct disassemble_info *, long);
38853882
#if 0
3886-
bfd_boolean found = FALSE;
3883+
bfd_boolean found = false;
38873884

38883885
if (info->disassembler_options)
38893886
{
@@ -3906,7 +3903,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
39063903
if (pc <= last_mapping_addr)
39073904
last_mapping_sym = -1;
39083905
is_thumb = (last_type == MAP_THUMB);
3909-
found = FALSE;
3906+
found = false;
39103907
/* Start scanning at the start of the function, or wherever
39113908
we finished last time. */
39123909
n = info->symtab_pos + 1;
@@ -3924,7 +3921,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
39243921
&& get_sym_code_type (info, n, &type))
39253922
{
39263923
last_sym = n;
3927-
found = TRUE;
3924+
found = true;
39283925
}
39293926
}
39303927

@@ -3941,7 +3938,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
39413938
if (get_sym_code_type (info, n, &type))
39423939
{
39433940
last_sym = n;
3944-
found = TRUE;
3941+
found = true;
39453942
break;
39463943
}
39473944
}
@@ -4013,7 +4010,7 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
40134010
#endif
40144011

40154012
if (force_thumb)
4016-
is_thumb = TRUE;
4013+
is_thumb = true;
40174014

40184015
info->bytes_per_line = 4;
40194016

arm-semi.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
* GNU General Public License for more details.
1616
*
1717
* You should have received a copy of the GNU General Public License
18-
* along with this program; if not, write to the Free Software
19-
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
20-
* MA 02110-1301, USA.
18+
* along with this program; if not, see <http://www.gnu.org/licenses/>.
2119
*/
2220

2321
#include <sys/types.h>

block_int.h

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#define BLOCK_OPT_BACKING_FILE "backing_file"
3838
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
3939
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
40+
#define BLOCK_OPT_PREALLOC "preallocation"
4041

4142
typedef struct AIOPool {
4243
void (*cancel)(BlockDriverAIOCB *acb);

bt-host.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
* GNU General Public License for more details.
1515
*
1616
* You should have received a copy of the GNU General Public License along
17-
* with this program; if not, write to the Free Software Foundation, Inc.,
18-
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
* with this program; if not, see <http://www.gnu.org/licenses/>.
1918
*/
2019

2120
#include "qemu-common.h"

bt-vhci.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
* GNU General Public License for more details.
1515
*
1616
* You should have received a copy of the GNU General Public License along
17-
* with this program; if not, write to the Free Software Foundation, Inc.,
18-
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17+
* with this program; if not, see <http://www.gnu.org/licenses/>.
1918
*/
2019

2120
#include "qemu-common.h"

0 commit comments

Comments
 (0)