diff options
author | Mark McLoughlin <markmc@redhat.com> | 2009-07-30 08:00:28 +0100 |
---|---|---|
committer | Mark McLoughlin <markmc@redhat.com> | 2009-07-30 08:00:37 +0100 |
commit | ee39cf2db96ee5712115cf34c255fa504d5efc1d (patch) | |
tree | 6963b76941c543f833fb9c03146a1e67544e67fd | |
parent | cfc7480d7f34547436f6521e3579bed58820b349 (diff) | |
parent | 8be3691a9adcf8e75b77dffedd76837504e54c46 (diff) |
Merge commit 'v0.11.0-rc1' into stable-0.11
* commit 'v0.11.0-rc1':
Update Changelog and VERSION for 0.11.0-rc1 release
Move CLOCKLIBS and PTHREADLIBS out of CONFIG_LINUX_USER_ONLY
Add a pc-0.11 machine type and make the pc type an alias
Add machine type aliases
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
-rw-r--r-- | Changelog | 89 | ||||
-rw-r--r-- | Makefile.target | 5 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | hw/boards.h | 1 | ||||
-rw-r--r-- | hw/pc.c | 3 | ||||
-rw-r--r-- | vl.c | 5 |
6 files changed, 101 insertions, 4 deletions
@@ -1,3 +1,92 @@ +version 0.11.0-rc1 + - add machine aliasing support (Mark McLoughlin) + - add getfd/closefd monitor commands (Mark McLoughlin) + - use correct headers for tap-win32 (Filip Navara) + - fix live migration (Glauber Costa) + - slirp: use monotonic clock if available (Ed Swierk) + - clear msix_entries_nr on error (Michael Tsirkin) + - HPET: fix reg writes (Beth Kon) + - slirp: fix guestfwd for incoming data (Jan Kiszka) + - fix build of qemu-thread.c on win32 (Sebastian Herbszt) + - improve signrom.sh portability (Christoph Egger) + - fix qemu-img convert to copy unallocated parts of the image + (Akkarit Sangpetch) + - vmdk: fix backing file handling (Kevin Wolf) + - scsi: add save/restore support (Nolan Leake) + - fix live migration for SCSI (Nolan Leake) + - various sparc build fixes (Blue Swirl) + - fix OpenBSD build (Blue Swirl) + - only allow -cpu host when using KVM (Anthony Liguori) + - fix build breakage when !KVM (Anthony Liguori) + +version 0.10.6: + - e1000: ignore reset command (Kevin Wolf) + - fix VNC memory allocation (Stefan Weil) + - fix raw_pread_aligned return value (Christoph Hellwig) + - allow monitor interaction when using -incoming exec: (Chris Lalancette) + - fix -net socket,listen (Jan Kiszka) + - live migration: don't send gratuitous packets all at once (Gleb Natapov) + - serial: fix lost characters after sysrq (Jason Wessel) + - Fix prototype of zfree (Stefan Weil) + - Handle EINTR with exec: migration (Uri Lublin) + - Delete io-handler before closing fd after migration (Uri Lublin) + - Fix qemu_aio_flush (Andrea Arcangeli) + - lsi53c895a: Implement additional registers (Sebastian Herbszt) + - virtio-blk: fix warning (Gerd Hoffman) + - i386: fix cpu reset (Nitin Kamble) + - kvm: fix irq injection into full queue (Jan Kiszka) + - Prevent CD-ROM eject while device is locked (Mark McLoughlin) + - Fix screen dump with blank screen (Eduardo Habkost) + - Fix memory leak with cpu_unregister_map_client (Isaku Yamahata) + - Fix memory leak in SDL (Jan Kiszka) + - Fix build on OS X 10.4 (John Arbuckle) + - Fix leak of vlan clients after hot remove (Mark McLoughlin) + - Fix migration after hot remove with eepro100 (Mark McLoughlin) + - Don't start a VM after failed migration if stopped (Anthony Liguori) + - Fix live migration under heavy IO load (Glauber Costa) + - Honor -S on incoming migration (Paolo Bonzini) + - Reset HPET config register on reset (Beth Kon) + - Reset PS2 keyboard/mouse on reset (Dinesh Subraveti) + +version 0.10.5: + - kvm: trim unsupported cpu features from cpuid (Avi Kivity) + - kvm: provide a better error message for -smp > 1 (Mark McLoughlin) + - Remove initrd printfs (Richard Jones) + - Initial variables found by valgrind (Jean-Christophe Dubois) + - Fix -initrd with > 4GB guests (Glauber Costa) + - Fix busy loop on live migration for certain platforms (Uri Lublin) + - Remove GCC 3.x requirements from docs (Hollis Blanchard) + - ETRAX: fixes for kernel command line, ethernet address, bmi (Edgar Iglesias) + - CRIS: Fix bmi (Edgar Iglesias) + - Fix bounce buffer errors (Avi Kivity) + - Fix regression in -kernel (Anthony Liguori) + +version 0.10.4: + - Improve block range checks to remove integer overflow (Kevin Wolf) + - e1000: do not re-init PCI config space 0 (Amit Shah) + - fix AIO deletion race (Alex Graf) + - reset option roms on reboot (Glauber Costa) + - fix qcow2 corruption in cluster freeing (Gleb Natapov) + - Enable power button event generation (Gleb Natapov) + +version 0.10.3: + - fix AIO cancellations (Avi Kivity) + - fix live migration error path on incoming + - avoid SEGV on pci hotplug failure (Chris Wright) + - fix serial option in -drive + - support DDIM for option roms (Glauber Costa) + - avoid fork/exec on pre-2.6.27 kernels with KVM (Jan Kiszka) + - block-vpc: don't silently create smaller images than requested (Kevin Wolf) + - Fix non-ACPI timer interrupt routing (Beth Kon) + - hpet: fix emulation of HPET_TN_SETVAL (Jan Kiszka) + - kvm: fix cpuid initialization (Jan Kiszka) + - qcow2: fix corruption on little endian hosts (Kevin Wolf) + - avoid leaing memory on hot unplug (Mark McLoughlin) + - fix savevm/migration after hot unplug (Mark McLoughlin) + - Fix keyboard mapping on newer Xords with non-default keymaps (balrog) + - Make PCI config status register read-only (Anthony Liguori) + - Fix crash on resolution change -> screen dump -> vga redraw (Avi Kivity) + version 0.10.2: - fix savevm/loadvm (Anthony Liguori) diff --git a/Makefile.target b/Makefile.target index a158c4ccc..72f14f6de 100644 --- a/Makefile.target +++ b/Makefile.target @@ -299,8 +299,6 @@ endif obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o \ ioport-user.o -LIBS+= $(PTHREADLIBS) -LIBS+= $(CLOCKLIBS) obj-$(TARGET_HAS_BFLT) += flatload.o ifdef TARGET_HAS_ELFLOAD32 @@ -326,6 +324,9 @@ signal.o: CFLAGS += $(HELPER_CFLAGS) ARLIBS=../libqemu_user.a libqemu.a endif #CONFIG_LINUX_USER +LIBS+= $(PTHREADLIBS) +LIBS+= $(CLOCKLIBS) + ######################################################### # Darwin user emulator target @@ -1 +1 @@ -0.10.90 +0.10.91 diff --git a/hw/boards.h b/hw/boards.h index 11acb89fc..d8893413d 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -14,6 +14,7 @@ typedef void QEMUMachineInitFunc(ram_addr_t ram_size, typedef struct QEMUMachine { const char *name; + const char *alias; const char *desc; QEMUMachineInitFunc *init; int use_scsi; @@ -1553,7 +1553,8 @@ void cmos_set_s3_resume(void) } static QEMUMachine pc_machine = { - .name = "pc", + .name = "pc-0.11", + .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, @@ -3402,6 +3402,8 @@ static QEMUMachine *find_machine(const char *name) for(m = first_machine; m != NULL; m = m->next) { if (!strcmp(m->name, name)) return m; + if (m->alias && !strcmp(m->alias, name)) + return m; } return NULL; } @@ -5063,6 +5065,9 @@ int main(int argc, char **argv, char **envp) QEMUMachine *m; printf("Supported machines are:\n"); for(m = first_machine; m != NULL; m = m->next) { + if (m->alias) + printf("%-10s %s (alias of %s)\n", + m->alias, m->desc, m->name); printf("%-10s %s%s\n", m->name, m->desc, m->is_default ? " (default)" : ""); |