summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* seabios: update to e8a76b0f225bba5ba9d63ab227e0a37b3beb1059Gerd Hoffmann2012-12-114-0/+0
| | | | | | | | | | | | | This patch updates seabios to latest git master. Changes: (1) q35 patches merged. (2) some acpi cleanups. (3) fixes irq 8 conflict. (3) makes this a candidate for the stable branch Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* Merge remote-tracking branch 'afaerber/qom-cpu' into stagingAnthony Liguori2012-12-1016-132/+149
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * afaerber/qom-cpu: target-i386: Postpone cpuid_level update to realize time target-i386: Use define for cpuid vendor string size target-i386: Separate feature string parsing from CPU model lookup target-i386/cpu.c: Coding style fixes qdev: qdev_create(): use error_report() instead of hw_error() sysemu.h: Include qemu-types.h instead of qemu-common.h Create qemu-types.h for struct typedefs qlist.h: Do not include qemu-common.h qga/channel-posix.c: Include headers it needs qapi/qmp-registry.c: Include headers it needs ui/vnc-palette.c: Include headers it needs user: Rename qemu-types.h to qemu-user-types.h user: Move *-user/qemu-types.h to main directory Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * target-i386: Postpone cpuid_level update to realize timeIgor Mammedov2012-12-071-3/+5
| | | | | | | | | | | | | | | | | | | | Delay capping cpuid_level to 7 to realize time so property setters for cpuid_7_0_ebx_features and "level" could be used in any order/time between x86_cpu_initfn() and x86_cpu_realize(). Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * target-i386: Use define for cpuid vendor string sizeIgor Mammedov2012-12-062-3/+5
| | | | | | | | | | | | Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * target-i386: Separate feature string parsing from CPU model lookupEduardo Habkost2012-12-061-23/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of parsing the whole cpu_model string inside cpu_x86_find_by_name(), first split it into the CPU model name and the full feature string, then parse the feature string into pieces. When using CPU model classes, those two pieces of information will be used at different moments (CPU model name will be used to find CPU class, feature string will be used after CPU object was created), so making the split in two steps will make it easier to refactor the code later. This should also help on the CPU properties work, that will just need to replace the cpu_x86_parse_featurestr() logic (and can keep the CPU model lookup code as-is). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * target-i386/cpu.c: Coding style fixesEduardo Habkost2012-12-061-14/+16
| | | | | | | | | | | | | | | | | | - Use spaces instead of tabs on cpu_x86_cpuid(). - Use braces on 'if' statement cpu_x86_find_by_name(). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * qdev: qdev_create(): use error_report() instead of hw_error()Eduardo Habkost2012-12-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | hw_error() is specific for fatal hardware emulation errors, not for internal errors related to the qdev object/class abstraction or object initialization. Replace it with an error_report() call, followed by abort(). This will also help reduce dependencies of the qdev code (as hw_error() is from cpus.o, and depends on the CPU list from exec.o). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * sysemu.h: Include qemu-types.h instead of qemu-common.hEduardo Habkost2012-12-061-1/+1
| | | | | | | | | | | | | | | | It just needs the Monitor and DeviceState typedefs, so it doesn't need all of qemu-common.h. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * Create qemu-types.h for struct typedefsEduardo Habkost2012-12-063-61/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of keeping all those struct typedefs in qemu-common.h, move it to a header that can be safely included by other headers, containing only the struct typedefs and not pulling in other dependencies. Also, move some of the qdev-core.h typedefs to the new file, too, so other headers don't need to include qdev-core.h only because of DeviceState and other typedefs. This will help us remove qemu-common.h dependencies from some headers later. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * qlist.h: Do not include qemu-common.hEduardo Habkost2012-12-061-1/+0
| | | | | | | | | | | | | | | | I don't know why it was including it, as I don't see any code that depends on anything from qemu-common.h. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * qga/channel-posix.c: Include headers it needsEduardo Habkost2012-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include: - <errno.h> for errno - <unistd.h> & <fcntl.h> for fcntl() - <stdlib.h> for exit() - "osdep.h" for qemu_open() Some of those headers were probably being included by accident because some other headers were including qemu-common.h, but those headers should eventually stop including qemu-common.h. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * qapi/qmp-registry.c: Include headers it needsEduardo Habkost2012-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Include: - <glib.h> for g_malloc0() - <string.h> for strcmp() Some of those headers were probably being included by accident because some other headers were including qemu-common.h, but those headers should eventually stop including qemu-common.h. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * ui/vnc-palette.c: Include headers it needsEduardo Habkost2012-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Include: - <glib.h> for g_malloc0() - <string.h> for memset() Some of those headers were probably being included by accident because some other headers were including qemu-common.h, but those headers should eventually stop including qemu-common.h. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * user: Rename qemu-types.h to qemu-user-types.hEduardo Habkost2012-12-064-3/+3
| | | | | | | | | | | | | | | | The header file is specific for *-user, but I plan to introduce a more generic qemu-types.h file, so I'm renaming it. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| * user: Move *-user/qemu-types.h to main directoryEduardo Habkost2012-12-062-24/+0
| | | | | | | | | | | | | | | | | | | | | | The bsd-user/qemu-types.h and linux-user/qemu-types.h files are almost the same, but linux-user has the additional definitions of tswapal(). This moves the linux-user file to the main directory, so the same file can be used by linux-user and bsd-user. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
* | Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2012-12-1019-48/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stefanha/trivial-patches: pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path qemu-options: Fix space at EOL Fix spelling in comments and documentation Clean up pci_drive_hot_add()'s use of BlockInterfaceType arm: a9mpcore: remove un-used ptimer_iomem field target-sparc: Remove t0, t1 from CPUSPARCState target-m68k: Remove t1 from CPUM68KState target-alpha: Remove t0, t1 from CPUAlphaState s390x: Spelling fixes (endianess -> endianness, occured -> occurred) Fix comments (adress -> address, layed -> laid, wierd -> weird) Fix spelling (prefered -> preferred) configure: Remove stray debug output sd: Send debug printfery to stderr not stdout Conflicts: configure Resolve spelling conflict in configure. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * | pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error pathMarkus Armbruster2012-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Harmless, because we the error inevitably leads to another, fatal one in pc_system_flash_init(): PC system firmware (pflash) not available. Fix it anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | qemu-options: Fix space at EOLMichal Privoznik2012-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to add a space at the end of line. Moreover, it can make problems in some projects that store the help output into a file (and run couple of tests based on that) and have space at EOL forbidden. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | Fix spelling in comments and documentationStefan Weil2012-12-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These spelling bugs were found by codespell: supressing -> suppressing transfered -> transferred Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | Clean up pci_drive_hot_add()'s use of BlockInterfaceTypeMarkus Armbruster2012-12-073-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | pci_drive_hot_add() parameter type has the wrong type: int instead of BlockInterfaceType. It's actually redundant, so we can just drop it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | arm: a9mpcore: remove un-used ptimer_iomem fieldPeter Crosthwaite2012-12-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | I'm guessing this is a hangover from a previous coreification of the mptimer sub-module. This field is completely unused - removed. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | target-sparc: Remove t0, t1 from CPUSPARCStateRichard Henderson2012-12-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | These fields are no longer used. Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | target-m68k: Remove t1 from CPUM68KStateRichard Henderson2012-12-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This field is no longer used. Cc: Paul Brook <paul@codesourcery.com> Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | target-alpha: Remove t0, t1 from CPUAlphaStateRichard Henderson2012-12-071-7/+0
| | | | | | | | | | | | | | | | | | | | | These fields are no longer (or were never?) used. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | s390x: Spelling fixes (endianess -> endianness, occured -> occurred)Stefan Weil2012-12-072-4/+4
| | | | | | | | | | | | | | | | | | | | | Replace also "write into" by "write to". Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | Fix comments (adress -> address, layed -> laid, wierd -> weird)Stefan Weil2012-12-073-5/+5
| | | | | | | | | | | | | | | | | | | | | Remove also a duplicated 'the'. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | Fix spelling (prefered -> preferred)Stefan Weil2012-12-072-4/+5
| | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | configure: Remove stray debug outputPeter Maydell2012-12-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than printing a message saying we're silently falling back to gthread coroutines when running on MacOS, actually do it silently. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| * | sd: Send debug printfery to stderr not stdoutPeter Crosthwaite2012-12-071-2/+2
| |/ | | | | | | | | | | | | | | | | Some debug printfs for SD are coming up in stdout. Redirected them to stderr instead. Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
* | Merge remote-tracking branch 'kraxel/acpi.1' into stagingAnthony Liguori2012-12-1011-415/+317
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * kraxel/acpi.1: acpi: drop debug port q35: update lpc pci config space according to configured devices apci: switch piix4 pci hotplug to memory api acpi: remove acpi_gpe_blk apci: switch piix4 gpe to memory api acpi: fix piix4 smbus mapping acpi: switch smbus to memory api acpi: cleanup ich9 memory region apci: switch ich9 smi to memory api apci: switch ich9 gpe to memory api acpi: cleanup vt82c686 memory region acpi: cleanup piix4 memory region apci: switch evt to memory api apci: switch cnt to memory api apci: switch timer to memory api apci: switch vt82c686 to memory api apci: switch ich9 to memory api apci: switch piix4 to memory api Conflicts: hw/lpc_ich9.c Resolved merge conflict due to apm_init adding an argument. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * | acpi: drop debug portGerd Hoffmann2012-12-041-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | I'm pretty sure this isn't needed any more. I think this predates the switch to seabios, and the seabios DSDT table has a DBUG() aml macro which writes stuff to the seabios debug port (0x402). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | q35: update lpc pci config space according to configured devicesGerd Hoffmann2012-12-043-12/+30
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch piix4 pci hotplug to memory apiGerd Hoffmann2012-12-041-8/+29
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: remove acpi_gpe_blkGerd Hoffmann2012-12-044-11/+0
| | | | | | | | | | | | | | | | | | With gpe being switched to memory api this is no longer needed. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch piix4 gpe to memory apiGerd Hoffmann2012-12-041-6/+18
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: fix piix4 smbus mappingGerd Hoffmann2012-12-041-1/+19
| | | | | | | | | | | | | | | | | | Make write to the smbus base register and enable bit actually work. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: switch smbus to memory apiGerd Hoffmann2012-12-045-50/+33
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: cleanup ich9 memory regionGerd Hoffmann2012-12-041-124/+1
| | | | | | | | | | | | | | | | | | | | | Nothing left to do, everything handled by subregions, we can zap the reaw/write handlers now. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch ich9 smi to memory apiGerd Hoffmann2012-12-042-10/+37
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch ich9 gpe to memory apiGerd Hoffmann2012-12-042-10/+29
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: cleanup vt82c686 memory regionGerd Hoffmann2012-12-041-60/+1
| | | | | | | | | | | | | | | | | | | | | Nothing left to do, everything handled by subregions, we can zap the reaw/write handlers now. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | acpi: cleanup piix4 memory regionGerd Hoffmann2012-12-041-40/+1
| | | | | | | | | | | | | | | | | | | | | Nothing left to do, everything handled by subregions, we can zap the reaw/write handlers now. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch evt to memory apiGerd Hoffmann2012-12-045-55/+54
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch cnt to memory apiGerd Hoffmann2012-12-045-31/+36
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch timer to memory apiGerd Hoffmann2012-12-045-17/+23
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch vt82c686 to memory apiGerd Hoffmann2012-12-041-10/+27
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch ich9 to memory apiGerd Hoffmann2012-12-042-17/+28
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| * | apci: switch piix4 to memory apiGerd Hoffmann2012-12-041-17/+24
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* | | Merge remote-tracking branch 'aneesh/for-upstream' into stagingAnthony Liguori2012-12-101-29/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * aneesh/for-upstream: virtfs-proxy-helper: use setresuid and setresgid Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * | | virtfs-proxy-helper: use setresuid and setresgidPaolo Bonzini2012-12-051-29/+64
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The setfsuid and setfsgid system calls are obscure and they complicate the error checking (that glibc's warn_unused_result "feature" forces us to do). Switch to the standard setresuid and setresgid functions. Signed-off-by: Paolo Bonzini <pbonini@redhat.com Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
OpenPOWER on IntegriCloud