summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2010-08-05Merge remote branch 'kraxel/spice.v14' into spice.kvm.v14spice.kvm.v14.spicevmcGerd Hoffmann1-2/+3
Conflicts: Makefile.target configure hw/pc.c monitor.c pc-bios/vgabios-cirrus.bin pc-bios/vgabios.bin
2010-08-04vgabios update to 0.6c + pcibios patches.Gerd Hoffmann1-2/+3
2010-08-01Merge commit 'fd2f659ee3f6f991f4f194f3fde5c9f957fd663d' into upstream-mergeAvi Kivity1-33/+5
* commit 'fd2f659ee3f6f991f4f194f3fde5c9f957fd663d': (58 commits) Update version for 0.13.0-rc0 vnc: better default values for VNC options vnc: tight: split send_sub_rect vnc: tight: fix rgb_prepare_row vnc: add missing lock for vnc_cursor_define() vnc: threaded VNC server qemu-thread: add qemu_mutex/cond_destroy and qemu_mutex_exit vnc: fix tight png memory leak vnc: encapsulate encoding members vnc: tight: stop using qdict for palette stuff vnc: tight: specific zlib level and filters for each compression level vnc: tight add PNG encoding vnc: tight: remove a memleak in send_jpeg_rect() vnc: tight: don't forget do at the last color vnc: rename vnc-encoding-* vnc-enc-* ui: move all ui components in ui/ vnc: add lossy option vnc: JPEG should be disabled if the client don't set tight quality vnc: tight: add JPEG and gradient subencoding with smooth image detection Initial documentation for migration ... Merge 0.13 branch point. Signed-off-by: Avi Kivity <avi@redhat.com>
2010-07-26ui: move all ui components in ui/Corentin Chary1-33/+5
Move sdl, vnc, curses and cocoa UI into ui/ to cleanup the root directory. Also remove some unnecessary explicit targets from Makefile. aliguori: fix build when srcdir != objdir Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-07-13Merge commit 'b7fdb3ab0e22a9a8debcb928497b248f06778845' into upstream-mergeMarcelo Tosatti1-2/+3
* commit 'b7fdb3ab0e22a9a8debcb928497b248f06778845': (23 commits) qemu-options: add documentation for stdio signal=on|off Update OpenBIOS images target-ppc: add vexptefp instruction softfloat: add float32_exp2() Update SeaBIOS pci/multi function bit: fix vt82c686.c. target-sh4: Add support for ldc & stc with sgr target-sh4: Split the LDST macro into 2 sub-macros pci: fix bridge update virtio-net: correct packet length math pci hotplug: make pci hotplug return value to caller vmware_vga: fix reset value for command register rtl8139: address TODOs pci hotplug: make pci_device_hot_remove() static pcnet: address TODOs pci: fix pci_device_reset AppleSMC device emulation Documentation: Fix spelling bugs Makefile: Not every shell support {} Makefile: add fsdev/*.{o,d} to clean ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-07-11Makefile: Not every shell support {}Hidetoshi Seto1-1/+2
So interpret it by hand. Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-07-11Makefile: add fsdev/*.{o,d} to cleanHidetoshi Seto1-1/+1
There were fsdev/qemu-fsdev.{o,d} not removed at "make clean". Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-07-04Merge commit 'a88790a14f60ac966a2103a958c3febf5a42836b' into upstream-mergeMarcelo Tosatti1-0/+1
* commit 'a88790a14f60ac966a2103a958c3febf5a42836b': (49 commits) remove exec-all.h inclusion from cpu.h move cpu_pc_from_tb to target-*/exec.h remove unused stuff from */exec.h Don't declare XSAVE as supported Add more boundary checking to sse3/4 parsing target-arm : fix parallel saturated subtraction implementation target-arm : fix thumb2 parallel add/sub opcode decoding target-arm: fix addsub/subadd implementation Makefile: add qemu-options.def to distclean Add QMP/qmp-commands.txt to .gitignore target-i386: fix xchg rax,r8 target-mips: add Loongson support prefetch target-mips: split load and store qdev-properties: Fix (u)intXX parsers Return usb device to host on exit Return usb device to host on usb_del command net: Fix VM start with '-net none' x86: svm: Always clear event_inj on vmexit usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate hw/omap : make local function static and remove declaration from header ... Conflicts: monitor.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-07-01Makefile: add qemu-options.def to distcleanHidetoshi Seto1-0/+1
Remove generated qemu-options.def at "make distclean". Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-06-24Remove old kvm-kmod traces from build systemJan Kiszka1-15/+0
This became a separate package long ago. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
2010-06-04Merge commit '358c360feb346dff8f911e2d1dbcdd6319393f1d' into upstream-mergeMarcelo Tosatti1-3/+10
* commit '358c360feb346dff8f911e2d1dbcdd6319393f1d': (64 commits) migration: respect exit status with exec: tcg-i386: fix a typo tcg-i386: declare tcg_out_tlb_load() inline tcg-i386: Remove some ifdefs in qemu_ld/st. tcg-i386: Split out tlb load function. tcg-i386: Swap order of TLB hit and miss paths. tcg-i386: Split out TLB Hit path from qemu_ld/st. tcg-i386: Tidy data16 prefixes. sparc64: fix umul and smul insns sparc64: fix udiv and sdiv insns sparc64: improve ldf and stf insns sparc64: use symbolic name for MMU index v1 sparc64: fix ldxfsr insn sparc64: fix 32bit load sign extension sparc64: fix missing address masking v1 sparc64: fix tag access register on mmu traps vnc: add missing target for vnc-encodings-*.o vnc: tight: don't forget the third color vnc: tight: don't forget last pixel in tight_encode_indexed_rect Monitor: Drop QMP documentation from code ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-06-01vnc: add missing target for vnc-encodings-*.oCorentin Chary1-3/+3
vnc-encodings-*.c dependencies where missing. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-06-01QMP: Introduce commands documentationJan Kiszka1-1/+4
One of the most important missing feature in QMP today is its supported commands documentation. The plan is to make it part of self-description support, however self-description is a big task we have been postponing for a long time now and still don't know when it's going to be done. In order not to compromise QMP adoption and make users' life easier, this commit adds a simple text documentation which fully describes all QMP supported commands. This is not ideal for a number of reasons (harder to maintain, text-only, etc) but does improve the current situation. To avoid at least divering from the user monitor help and texi snippets, QMP bits are also maintained inside qemu-monitor.hx, and hxtool is extended to generate a single text file from them. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-06-01Add dependency of JSON unit tests on config-host.hJan Kiszka1-0/+2
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-06-01vnc: add basic tight supportCorentin Chary1-0/+2
Add support for tight encoding [1]. This patch only add support for "basic" tight compression without any filter. [1] http://tigervnc.org/cgi-bin/rfbproto#tight-encoding. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-05-26Merge remote branch 'upstream' into upstream-mergeAvi Kivity1-34/+13
* upstream: (32 commits) vnc: rich cursor support. use new cursor struct + functions for vmware vga and sdl. cursor: add cursor functions. Fix error handling in qemu_read_config_file Virtio-net: Replace the hardcode 6 with defined ETN_ALEN sdl: Do not disable screensaver by default microblaze: Handle new elf mach nr for sysemu. lsi: Fix value overflow in request tag processing sparc64: flush translations on mmu context change sparc64: fix mmu context at trap levels above zero sparc64: fix dump_mmu to look for global bit in tte value instead of tag sparc64: fix pstate privilege bits sparc64: generate data access exception on RW violation sparc32 protect read-only bits in DMA CSR registers vmstate: fix breakage by 7e72abc382b700a72549e8147bdea413534eeedc Fix -device help and documentation Fix tarbin Makefile rule hxtool: Add syntax error detection Fix TEXI section mark imbalance in qemu-img-cmd.hx Put dependency files in proper subdir ... Signed-off-by: Avi Kivity <avi@redhat.com>
2010-05-26Merge commit 'fe270d044d512a308fb1fdf02cb11db46df29cdb' into upstream-mergeAvi Kivity1-1/+2
* commit 'fe270d044d512a308fb1fdf02cb11db46df29cdb': target-s390: add firmware code PPC/KVM: make iothread work fix chardev_init for win32 qemu-sockets: avoid strlen of NULL pointer linux-user: rlimit conversion between host and target. Conflicts: Makefile Signed-off-by: Avi Kivity <avi@redhat.com>
2010-05-22Fix tarbin Makefile ruleStuart Brady1-34/+13
The 'tarbin' Makefile rule doesn't include qemu-system-sparc64, but should do, now that sparc64-softmmu is in the default target list. The rule attempts to tar up binaries that were not built if a target list was passed to the configure script -- in which case, it will either fail, or otherwise include binaries from previous builds. Fix both problems once and for all by building a list of binaries to include in the tarball, using the list of targets to be built. Signed-off-by: Stuart Brady <sdb@zubnet.me.uk> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-05-18target-s390: add firmware codeAlexander Graf1-1/+2
This patch adds a firmware blob to the S390 target. The blob is a simple implementation of a virtio client that tries to read the second stage bootloader from sectors described as of offset 0x20 in the MBR. In combination with an updated zipl this allows for booting from virtio block devices. This firmware is built from the same sources as the second stage bootloader. You can find a virtio capable s390-tools in this repo: git://repo.or.cz/s390-tools.git Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-05-03Merge commit '74db920c32cea5b52a91b81f2bfd467fc070e942' into upstream-mergeMarcelo Tosatti1-0/+4
* commit '74db920c32cea5b52a91b81f2bfd467fc070e942': (34 commits) virtio-9p: Create a commandline option -fsdev virtio-serial: Fix check for 'assert'; prevent NULL derefs Fix the RARP protocol ID Fix tiny leak in qemu_opts_parse lsi: Properly initialize controller state on reset lsi: Purge request queue on soft reset Fix boot once option vnc: split encoding in specific files vnc: Fix compile error on x86_64 with -D_VNC_DEBUG=1 block: Release allocated options after bdrv_open qemu-img rebase: Fix output image corruption block: Add wr_highest_sector blockstat qcow2: Implement bdrv_truncate() for growing images qcow2: Remove abort on free_clusters failure qemu-img: Add 'resize' command to grow/shrink disk images block: Cache total_sectors to reduce bdrv_getlength calls raw-posix: Use pread/pwrite instead of lseek+read/write qcow2: Avoid shadowing variable in alloc_clusters_noref() block: Set backing_hd to NULL after deleting it vmdk: Convert to bdrv_open ... Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-05-03vnc: split encoding in specific filesCorentin Chary1-0/+4
This will allow to implement new encodings (tight, zrle, ..) in a cleaner way. This may hurt performances, because some functions like vnc_convert_pixel are not static anymore, but should not be a problem with gcc 4.5 and the new -flto. Signed-off-by: Corentin Chary <corentincj@iksaif.net> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-05-01Merge commit '9ed7b059ef776a3921cfd085e891f45076922542' into upstream-mergeMarcelo Tosatti1-0/+2
* commit '9ed7b059ef776a3921cfd085e891f45076922542': (40 commits) virtio-serial: Implement flow control for individual ports virtio-serial: Discard data that guest sends us when ports aren't connected virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse virtio-serial: Handle scatter/gather input from the guest virtio-serial: Handle scatter-gather buffers for control messages iov: Add iov_to_buf and iov_size helpers iov: Introduce a new file for helpers around iovs, add iov_from_buf() virtio-serial: Send out guest data to ports only if port is opened virtio-serial: Propagate errors in initialising ports / devices in guest virtio-serial: Update copyright year to 2010 virtio-serial: Remove redundant check for 0-sized write request virtio-serial: whitespace: match surrounding code virtio-serial: Use control messages to notify guest of new ports virtio-serial: save/load: Send target host connection status if different virtio-serial: save/load: Ensure we have hot-plugged ports instantiated virtio-serial: save/load: Ensure nr_ports on src and dest are same. virtio-serial: save/load: Ensure target has enough ports microblaze: fix custom fprintf Implement cpu_get_real_ticks for Alpha. target-alpha: Implement RPCC. ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-04-28iov: Introduce a new file for helpers around iovs, add iov_from_buf()Amit Shah1-0/+2
The virtio-net code uses iov_fill() which fills an iov from a linear buffer. The virtio-serial-bus code does something similar in an open-coded function. Create a new iov.c file that has iov_from_buf(). Convert virtio-net and virtio-serial-bus over to use this functionality. virtio-net used ints to hold sizes, the new function is going to use size_t types. Later commits will add the opposite functionality -- going from an iov to a linear buffer. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-04-06Merge commit 'd745bef890f9fa57298ae099365da8e8aa575cbd' into upstream-mergeMarcelo Tosatti1-3/+3
* commit 'd745bef890f9fa57298ae099365da8e8aa575cbd': (35 commits) Move KVM and Xen global flags to vl.c Move cpu_exec_init_all() declaration to qemu-common.h Allow various header files to be included from non-CPU code Adjust debug handling tcg/mips: fix branch offset during retranslation exec: remove dead code linux-user/ppc: use the Linux register layout qemu-io: fix aio help texts tcg/arm: Replace qemu_ld32u (left over from previous commit) Fix driftfix option Fix BSD and win32 builds Refactor numa mode setting pflash_cfi02: fix incorrect TARGET_FMT_lx/d use Compile vmware_vga only once tcg-mips: add guest base support tcg/mips: implement the not_i32 op the same way as gcc tcg-mips: implement nor be more specific in -mem-path error messages Add a missing #include for FreeBSD hosts error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-04-05Merge commit 'aaf12c25312c49620777a232e8f770357450a603' into upstream-mergeMarcelo Tosatti1-4/+4
* commit 'aaf12c25312c49620777a232e8f770357450a603': Revert 'Fix build' Revert "Introduce a default qmp session" Revert "qmp: don't make -qmp disable the default monitor" Revert "tap: invoke downscript when we exit abnormally" Revert "Convert atexit users to exit_notifier" Revert "Add exit notifiers" Fix a typo Compile disassemblers only once tcg/arm: don't save/restore r7 in prologue/epilogue tcg/arm: fix load/store definitions for 32-bit targets tcg: protect div2 in tcg/tcg-opc.h Fix a typo which broke Xen build Fix mingw32 build Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-03-27error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.oMarkus Armbruster1-3/+3
The location tracking interface is used by code shared with qemi-img, qemu-nbd and qemu-io, so it needs to be available there. Commit 827b0813 provides it in a rather hamfisted way: it adds a dummy implementation to qemu-tool.c. It's cleaner to provide the real thing, and put a few more dummy monitor functions into qemu-tool.c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-03-21Compile disassemblers only onceBlue Swirl1-4/+4
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-03-15Merge commit 'c6dc6f63bf7ee418c0a430a8b3386817ede69940' into upstream-mergeMarcelo Tosatti1-2/+2
* commit 'c6dc6f63bf7ee418c0a430a8b3386817ede69940': (24 commits) x86/cpuid: move CPUID functions into separate file Fix build with -DNDEBUG in CFLAGS Fix a typo in error message fdc: fix drive property handling. install: honor DESTDIR on sysconfdir population configure: fix --sysconfdir specification target-arm: make RFE usable with any register tcg/arm: implement andc op tcg: update README with const and pure helpers tcg/arm: correctly save/restore registers in prologue/epilogue target-i386: fix commit c22549204a6edc431e8e4358e61bd56386ff6957 target-mips: update address space definitions Fix Sparc host build breakage Fix more wrong usermode virtual address types Fix usermode virtual address type FreeBSD ppc_init_cacheline_sizes(): add missing #includes tcg/ppc[64]: Only define addend load helpers in softmmu case Remove userspace target_phys_addr_t Target specific usermode cleanup Remove cpu_get_phys_page_debug from userspace emulation ... Conflicts: target-i386/helper.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-03-13install: honor DESTDIR on sysconfdir populationAndre Przywara1-2/+2
When creating and populating $sysconfdir, we should prepend $DESTDIR as we do with all other paths. Reported-by: Frank Arnold <frank.arnold@amd.com> Signed-off-by: Andre Przywara <andre.przywara@amd.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-03-08Merge commit '93d67ee69d6104976961fbc98654872de28a5c96' into upstream-mergeMarcelo Tosatti1-3/+8
* commit '93d67ee69d6104976961fbc98654872de28a5c96': (29 commits) Fix hanging user monitor when using balloon command sdl: improve grab exiting instructions ppc: don't define bamboo-0.13 as the default machine Update to a hopefully more future proof FSF address i386-dis: remove dead assignments, spotted by clang softfloat: remove dead assignments, spotted by clang slirp: remove dead nested assignment, spotted by clang slirp: remove dead initialization, spotted by clang slirp: remove dead increments, spotted by clang slirp: remove dead assignments, spotted by clang target-arm: Fix missing 'return' in SRS handling. Fix curses interaction with keymaps use absolute URLs for .gitmodules Documentation: Modify rule for html output (better looking output format) scsi: update comment on the standards revision qemu-nbd: Fix wrong description in qemu-nbd.texi Build usb-ohci for PCs ppc440_bamboo: Disable new virtio-serial features for 0.12 machine type ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compat s390-virtio: Fix compile error for virtio-block init ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-03-06Documentation: Modify rule for html output (better looking output format)Stefan Weil1-2/+5
To create html output from texi input, texi2html was used. Output from makeinfo looks cleaner, so replace the old rule and use makeinfo now. For those who want to use their own variant of html output, the macros MAKEINFO and MAKEINFOFLAGS allow customisation. Option "-I ." is not needed (the current directory is searched by default), so remove it. Please note that the build requirements changed, too: makeinfo is required for doc builds. texi2html is no longer used. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-03-04Makefile: Fix names of GPXE ROM filesStefan Weil1-1/+3
da51e79b7ff2126cc2448749d657a4f6e3b1270f added two new ROM files and removed an old one for eepro100.c. These changes were missing in Makefile (which resulted in a broken "make install"). Reported by Lucas Meneghel Rodrigues, thanks. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-03-04Merge commit '6049f4f831c6f409031dfa09282b38d0cbaecad8' into upstream-mergeMarcelo Tosatti1-1/+1
* commit '6049f4f831c6f409031dfa09282b38d0cbaecad8': (32 commits) alpha-linux-user: Implement signals. target-alpha: Implement IEEE FP qualifiers. target-ppc: don't print invalid opcode messages on the console Revert "target-ppc: stop translation after a trap instruction" audio/alsa: Handle SND_PCM_STATE_SETUP in alsa_poll_handler audio/alsa: Spelling typo (paramters) target-ppc: stop translation after a trap instruction qemu-char.c: drop debug printfs from qemu_chr_parse_compat powerpc/e500: adjust fdt and ramdisk loading addr powerpc: fix compilation with CONFIG_FDT undefined powerpc/booke: move fdt loading to rom infrastructure target-ppc: add synchronize register for booke init target-sh4: Fix gdb read/write register target-ppc: fix SPE evsplat* instructions target-ppc: fix SPE evcmp* instructions arm host: Fix linker warning (m68k targets) Fix 'make install' from non-srcdir build Fix to 'gdb detach' stub Fix qemu -net user,hostfwd= example tcg/ppc: Fix right rotation ... Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-02-27Fix 'make install' from non-srcdir buildAmit Shah1-1/+1
Commit b5ec5ce0 broke 'make install' from non source-dir build. Fix. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-02-24Merge commit 'b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48' into upstream-mergeMarcelo Tosatti1-1/+5
* commit 'b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48': Add cpu model configuration support.. add close callback for tty-based char device Fix lost serial TX interrupts. Report receive overruns. tcg/ppc: Fix typo apc_pci: simplify using rwhandler apb_pci: minor cleanup Update OpenBIOS images to r683 Fix arm-softmmu compile tcg/ppc64: Use C90 style comments tcg/ppc: Implement some of the optional ops tcg: fix build on 32-bit hppa, ppc and sparc hosts PL181 write fix Allow const QemuOptDesc cris: Add CRISv10 gdbstub support. cris: Mask interrupts on dslots for CRISv10. microblaze: Improve brk emulation. microblaze: Dont segfault when singlestepping first insn. target-sparc: fix --enable-debug build tcg: fix assertion with --enable-debug Conflicts: target-i386/helper.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-02-22Add cpu model configuration support..john cooper1-1/+5
This is a reimplementation of prior versions which adds the ability to define cpu models for contemporary processors. The added models are likewise selected via -cpu <name>, and are intended to displace the existing convention of "-cpu qemu64" augmented with a series of feature flags. A primary motivation was determination of a least common denominator within a given processor class to simplify guest migration. It is still possible to modify an arbitrary model via additional feature flags however the goal here was to make doing so unnecessary in typical usage. The other consideration was providing models names reflective of current processors. Both AMD and Intel have reviewed the models in terms of balancing generality of migration vs. excessive feature downgrade relative to released silicon. This version of the patch replaces the prior hard wired definitions with a configuration file approach for new models. Existing models are thus far left as-is but may easily be transitioned to (or may be overridden by) the configuration file representation. Proposed new model definitions are provided here for current AMD and Intel processors. Each model consists of a name used to select it on the command line (-cpu <name>), and a model_id which corresponds to a least common denominator commercial instance of the processor class. A table of names/model_ids may be queried via "-cpu ?model": : x86 Opteron_G3 AMD Opteron 23xx (Gen 3 Class Opteron) x86 Opteron_G2 AMD Opteron 22xx (Gen 2 Class Opteron) x86 Opteron_G1 AMD Opteron 240 (Gen 1 Class Opteron) x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7) x86 Penryn Intel Core 2 Duo P9xxx (Penryn Class Core 2) x86 Conroe Intel Celeron_4x0 (Conroe/Merom Class Core 2) : Also added is "-cpu ?dump" which exhaustively outputs all config data for all defined models, and "-cpu ?cpuid" which enumerates all qemu recognized CPUID feature flags. The pseudo cpuid flag 'check' when added to the feature flag list will warn when feature flags (either implicit in a cpu model or explicit on the command line) would have otherwise been quietly unavailable to a guest: # qemu-system-x86_64 ... -cpu Nehalem,check warning: host cpuid 0000_0001 lacks requested flag 'sse4.2|sse4_2' [0x00100000] warning: host cpuid 0000_0001 lacks requested flag 'popcnt' [0x00800000] A similar 'enforce' pseudo flag exists which in addition to the above causes qemu to error exit if requested flags are unavailable. Configuration data for a cpu model resides in the target config file which by default will be installed as: /usr/local/etc/qemu/target-<arch>.conf The format of this file should be self explanatory given the definitions for the above six models and essentially mimics the structure of the static x86_def_t x86_defs. Encoding of cpuid flags names now allows aliases for both the configuration file and the command line which reconciles some Intel/AMD/Linux/Qemu naming differences. This patch was tested relative to qemu.git. Signed-off-by: john cooper <john.cooper@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-02-17Merge commit '4a7e1190dfadf1154721125af8510347f8a3c56b' into upstream-mergeMarcelo Tosatti1-8/+13
* commit '4a7e1190dfadf1154721125af8510347f8a3c56b': (32 commits) QMP: Introduce the qmp_capabilities command QMP: Add QEMU's version to the greeting message segfault due to buffer overrun in usb-serial audio streaming from usb devices vnc: Migrate to using QTAILQ instead of custom implementation kvm: reduce code duplication in config_iothread Documentation: Add command line options to function index Documentation: Add monitor commands to function index Documentation: Enhance documentation (index, keywords) Documentation: Fix item list Documentation: Add some basic documentation on make targets Documentation: Use UTF-8 encoding and fix one wrong encoding Documentation: Add direntry for info format block: saner flags filtering in bdrv_open2 virtio-blk: Generate BLOCK_IO_ERROR QMP event scsi: Generate BLOCK_IO_ERROR QMP event ide: Generate BLOCK_IO_ERROR QMP event block: BLOCK_IO_ERROR QMP event QMP: BLOCK_IO_ERROR event handling qcow2: Fix signedness bugs ... Conflicts: qemu-monitor.hx Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-02-17Merge commit 'd0f2c4c60263e29a87681433e696844401514194' into upstream-mergeMarcelo Tosatti1-1/+1
* commit 'd0f2c4c60263e29a87681433e696844401514194': (47 commits) Do not use dprintf arm host: fix compiler warning tcg-i386: Implement setcond. tcg-i386: Implement small forward branches. Add -static earlier to LDFLAGS for compile_prog() Fix missing symbols in .rel/.rela.plt sections configure: remove debugging code introduced in aa527b65d8187b97d73f889b6cae7b6ac6f82d32 configure: fix compilation on hosts without -fstack-protector-all Update MAINTAINERS target-mips: don't call cpu_loop_exit() from helper.c target-arm: refactor cp15.c13 register access linux-user: remove signal handler before calling abort() fix locking error with current_tb linux-user: adapt uname machine to emulated CPU target-ppc: change DCR helpers to target_long arguments tcg-x86_64: implement setcond tcg: add tcg_invert_cond tcg: generic support for conditional set tcg: document double-word support opcodes. usb-linux: increase buffer for USB control requests ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-02-10Documentation: Add build support for documentation in pdf formatStefan Weil1-8/+13
Makefile already supported dvi, html and info formats, but pdf was missing. pdf is especially convenient for printing and for documentation reviews. I hope it will help to improve qemu's documentation. Make now supports the new target 'pdf' which will create qemu-doc.pdf and qemu-tech.pdf. It is also possible to build both files individually. texi2pdf and texi2dvi are rather noisy, so normally some less important warnings are suppressed. When make is called with V=1 (verbose mode), warnings are not suppressed. The patch also sorts the documentation targets alphabetically and wraps a line which was too long. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-02-03QDict: New qdict_get_double()Markus Armbruster1-1/+1
Helper function just like qdict_get_int(), just for QFloat/double. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-31Merge commit '625a5befc2e3200b396594f002218d235e375da5' into upstream-mergeMarcelo Tosatti1-12/+5
* commit '625a5befc2e3200b396594f002218d235e375da5': virtio: Add memory statistics reporting to the balloon driver New API for asynchronous monitor commands block: avoid creating too large iovecs in multiwrite_merge vnc_refresh: calling vnc_update_client might free vs block/raw-posix: Abort on pread beyond end of non-growable file win32: pair qemu_memalign() with qemu_vfree() win32/sdl: Fix toggle full screen Tell users about out-of-memory errors PCI: fix bridge configuration fix savevm command without id or tag qcow2: rename two QCowAIOCB members block: kill BDRV_O_CREAT block: clean up bdrv_open2 structure a bit virtio-console: Automatically use virtio-serial-bus for the older -virtioconsole invocation virtio-console: Rename virtio-serial.c back to virtio-console.c Fix generation of config-host.h ide save/restore current transfer fields PCI: do_pci_info(): PCI bridge devices support Conflicts: hw/virtio-balloon.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-01-26Fix generation of config-host.hJuan Quintela1-12/+5
This patch improves Anthony patch a6a853c86275efd89996ce59612a000c5873db5d Once there, it improves handling of object files for qemu tools cc: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-21Merge commit '3e39789b64b01444b6377a043894e6b9a3ba6cbb' into upstream-mergeMarcelo Tosatti1-1/+1
* commit '3e39789b64b01444b6377a043894e6b9a3ba6cbb': Revert "block: prevent multiwrite_merge from creating too large iovecs" make: qemu-img depends on config-host.h reduce number of reinjects on ACK block: prevent multiwrite_merge from creating too large iovecs block: fix cache flushing in bdrv_commit QMP: Fix asynchronous events delivery vnc: Use inet_strfamily() net: inet_strfamily(): Better unknown family report net: Make inet_strfamily() public virtio-serial: Use MSI vectors for port virtqueues Move virtio-serial to Makefile.objs virtio-serial: Add a 'virtserialport' device for generic serial port support virtio-serial-bus: Add ability to hot-unplug ports virtio-serial-bus: Add a port 'name' property for port discovery in guests virtio-serial-bus: Maintain guest and host port open/close state Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-01-21Merge commit '49a945a3c0107463de3e57394622eff251e52fc4' into upstream-mergeMarcelo Tosatti1-0/+2
* commit '49a945a3c0107463de3e57394622eff251e52fc4': (28 commits) kill regs_to_env and env_to_regs remove dead code from target-i386/exec.h rtl8139: fix clang reporting unused assignment of VLAN tagging data eepro100: Fix multicast support eepro100: Restructure code (new function tx_command) Sparc32: Update OpenBIOS image to r666 Sparc: improve CPU register dump fix linux-user microblaze ELF_ARCH definition audio: include more information into audio_bug's output Revert "sdlaudio: make it suck less" Sparc32: improve DMA controller IRQ debugging ESP: improve IRQ debugging sparc32 do not clear interrupts when masking Update Sparc OpenBIOS images to r665 sparc32 do_unassigned_access overhaul v2 tcg/x86_64: Avoid unnecessary REX.B prefixes. nand: Correct random data reads. Makefile: Fix message for missing configure target-m68k: fix a typo in 'P' packet processing tcg/x86_64: Special-case all 32-bit AND operands. ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-01-21Merge commit '8832cb805dcb65009b979cd8e17d75ac4b03c7e4' into upstream-mergeMarcelo Tosatti1-5/+2
* commit '8832cb805dcb65009b979cd8e17d75ac4b03c7e4': (36 commits) roms: rework rom loading via fw fw_cfg: rom loader tweaks. roms: minor fixes and cleanups. pc: add machine type for 0.12 Handle TFTP ERROR from client dmg: fix ->open failure virtio-pci: thinko fix virtio: add features as qdev properties virtio: rename features -> guest_features qdev: add bit property type pc-bios: Update README (SeaBIOS) lsi: pass lsi_request to lsi_reselect lsi: move dma_len+dma_buf into lsi_request lsi: move current_dev into lsi_request lsi: have lsi_request for the whole life time of the request. lsi: use QTAILQ for lsi_queue vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow remove pending exception on vcpu reset. Fix CPU topology initialization MCE: Fix bug of IA32_MCG_STATUS after system reset ... Conflicts: hw/pc.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-01-21Merge commit 'c9f398e53fedb88df243e32eb9bc50fda4ec44d0' into upstream-mergeMarcelo Tosatti1-6/+16
* commit 'c9f398e53fedb88df243e32eb9bc50fda4ec44d0': debugcon: support for debugging consoles (e.g. Bochs port 0xe9) Makefile: Update unmodified config-devices.mak automatically Use vpath directive oss: workaround for cases when OSS_GETVERSION is not defined Sparc32: clear exception_index with -1 value Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
2010-01-20make: qemu-img depends on config-host.hAnthony Liguori1-1/+1
Fixes mingw32 build out of tree. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-14Makefile: Fix message for missing configureStefan Weil1-0/+2
When make is called without a valid configuration, it should tell the user what to do. Revision 0e8c9214ba1d4128cf92442cd343bc3733478261 was a regression which resulted in a message which was no longer user friendly (reported by Aurelien Jarno). This patch restores the old behaviour. Cc: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Andreas Färber <afaerber@opensolaris.org> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2010-01-08finish VPATH -> vpath translationPaolo Bonzini1-1/+1
This adds a few more vpath suffixes and points the remaining two paths explicitly to $(SRC_PATH) in order to eliminate the VPATH assignment from config-host.mak. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Cc: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2010-01-08Makefile: remove obsolete libuser.a ruleBlue Swirl1-4/+1
libuser.a was removed by 0e8c9214ba1d4128cf92442cd343bc3733478261. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>