Commit 9423a2e8 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging

parents da5361cc 126c7913

Changelog

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ version 0.10.2: 


  - fix savevm/loadvm (Anthony Liguori)

  - live migration: fix dirty tracking windows (Glauber Costa)

  - live migration: improve error propogation (Glauber Costa)

  - live migration: improve error propagation (Glauber Costa)

  - qcow2: fix image creation for > ~2TB images (Chris Wright)

  - hotplug: fix error handling for if= parameter (Eduardo Habkost)

  - qcow2: fix data corruption (Nolan Leake)
@@ -386,7 +386,7 @@ version 0.5.3: 
  - support of CD-ROM change

  - multiple network interface support

  - initial x86-64 host support (Gwenole Beauchesne)

  - lret to outer priviledge fix (OS/2 install fix)

  - lret to outer privilege fix (OS/2 install fix)

  - task switch fixes (SkyOS boot)

  - VM save/restore commands

  - new timer API

LICENSE

+1 −3
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ The following points clarify the QEMU license: 
GNU General Public License. Hence each source file contains its own

licensing information.



In particular, the QEMU virtual CPU core library (libqemu.a) is

released under the GNU Lesser General Public License. Many hardware

device emulation sources are released under the BSD license.

Many hardware device emulation sources are released under the BSD license.



3) The Tiny Code Generator (TCG) is released under the BSD license

   (see license headers in files).

Makefile.objs

+3 −4
Original line number Diff line number Diff line
@@ -68,10 +68,9 @@ endif 
fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))



######################################################################

# libqemu_common.a: Target independent part of system emulation. The

# long term path is to suppress *all* target specific code in case of

# system emulation, i.e. a single QEMU executable should support all

# CPUs and machines.

# Target independent part of system emulation. The long term path is to

# suppress *all* target specific code in case of system emulation, i.e. a

# single QEMU executable should support all CPUs and machines.



common-obj-y = $(block-obj-y) blockdev.o

common-obj-y += $(net-obj-y)

Makefile.target

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci 


$(libobj-y): $(GENERATED_HEADERS)



# libqemu



translate.o: translate.c cpu.h



translate-all.o: translate-all.c cpu.h

block.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ typedef struct QEMUSnapshotInfo { 
    char id_str[128]; /* unique snapshot id */

    /* the following fields are informative. They are not needed for

       the consistency of the snapshot */

    char name[256]; /* user choosen name */

    char name[256]; /* user chosen name */

    uint32_t vm_state_size; /* VM state info size */

    uint32_t date_sec; /* UTC date of the snapshot */

    uint32_t date_nsec;