]> xenbits.xensource.com Git - qemu-xen-4.3-testing.git/log
qemu-xen-4.3-testing.git
16 years agoqemu have a slightly different coding style
Ian Jackson [Fri, 30 May 2008 16:29:21 +0000 (17:29 +0100)]
qemu have a slightly different coding style

16 years agoNo need to call pci_e100_init since it's pci_i8255*_init in upstream
Ian Jackson [Fri, 30 May 2008 16:25:53 +0000 (17:25 +0100)]
No need to call pci_e100_init since it's pci_i8255*_init in upstream

16 years ago#include missing hw/pci.h
Ian Jackson [Fri, 30 May 2008 16:20:21 +0000 (17:20 +0100)]
#include missing hw/pci.h

16 years agoEnable HVM guest VT-d device hotplug via a simple ACPI hotplug device model.
Ian Jackson [Fri, 30 May 2008 16:18:08 +0000 (17:18 +0100)]
Enable HVM guest VT-d device hotplug via a simple ACPI hotplug device model.

Finish merge of remaining parts of xen-unstable c/s
17056:c6eeb71a85cffe917bc8d6738fd36e6694dba4d6:

    Enable HVM guest VT-d device hotplug via a simple ACPI hotplug device model.

    ** Currently only 2 virtual hotplug pci slots(6~7) are created so more
       than 2 vtd dev can't be hotplugged, but we can easily extend it in
       future.

    Three new commands are added:
    "xm pci-list domid" show the current assigned vtd device, like:
    VSlt  domain   bus   slot   func
    0x6      0x0  0x02   0x00    0x0

    "xm pci-detach" hot remove the specified vtd device by the virtual
    slot, like:
    xm pci-detach EdwinHVMDomainVtd 6

    "xm pci-attach DomainID dom bus dev func [vslot]" hot add a new vtd
    device in the vslot. If no vslot specified, a free slot will be picked
    up. e.g. to insert '0000:03:00.0':
    xm pci-attach EdwinHVMDomainVtd 0 3 0 0

    ** guest pci hotplug
    linux: pls. use 2.6.X and enable ACPI PCI hotplug ( Bus options=> PCI
    hotplug => ACPI PCI hotplug driver )
    windows: 2000/xp/2003/vista are all okay

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
16 years agoPCI passthrough merge completion
Ian Jackson [Fri, 30 May 2008 16:07:31 +0000 (17:07 +0100)]
PCI passthrough merge completion

Remaining parts of xen-unstable c/s
15891:acfa9290746f9c00e30dca7a62e9f7a96702b3b5:

    PCI passthru: tools changes (generic and vt-d)

    I have added CONFIG_PASSTHROUGH in ioemu/Makefile.target and
    ioemu/hw/pc.c in attached vtd_tools2.patch.  This should turn off
    libpci usage by default until user specifically enables it.

    This can be safely check-in without breaking builds for people who do
    not care about pass-through devices.  I will try to think of a better
    way to enable this.

Signed-off-by: Allen Kay <allen.m.kay@intel.com>
Signed-off-by: Guy Zana <guy@neocleus.com>
16 years agoReuse most of configure-generated config
Ian Jackson [Fri, 30 May 2008 11:11:18 +0000 (12:11 +0100)]
Reuse most of configure-generated config

16 years agoremove spurious #if
Ian Jackson [Thu, 29 May 2008 16:59:02 +0000 (17:59 +0100)]
remove spurious #if

16 years agofix up more broken merge results for vncunused patch
Ian Jackson [Thu, 29 May 2008 16:54:07 +0000 (17:54 +0100)]
fix up more broken merge results for vncunused patch

16 years agoprovide default gui refresh value
Ian Jackson [Thu, 29 May 2008 16:53:48 +0000 (17:53 +0100)]
provide default gui refresh value

16 years agoadd gui_timer to DisplayState as in upstream
Ian Jackson [Thu, 29 May 2008 16:46:37 +0000 (17:46 +0100)]
add gui_timer to DisplayState as in upstream

16 years agomove case QEMU_OPTION_vncunused to right spot (undo merge damage)
Ian Jackson [Thu, 29 May 2008 16:42:39 +0000 (17:42 +0100)]
move case QEMU_OPTION_vncunused to right spot (undo merge damage)

16 years agoadd size string parameter to text_console_init - currently ignored by our fork of...
Ian Jackson [Thu, 29 May 2008 16:38:49 +0000 (17:38 +0100)]
add size string parameter to text_console_init - currently ignored by our fork of the code :-/

16 years agoremove duplicate definition of CONFIG_DM
Ian Jackson [Thu, 29 May 2008 16:02:30 +0000 (17:02 +0100)]
remove duplicate definition of CONFIG_DM

16 years agobuild system fixes to build i386-dm
Ian Jackson [Thu, 29 May 2008 16:00:19 +0000 (17:00 +0100)]
build system fixes to build i386-dm

16 years agodisable if CONFIG_DM
Ian Jackson [Thu, 29 May 2008 15:57:15 +0000 (16:57 +0100)]
disable if CONFIG_DM

16 years agoset CONFIG_DM
Ian Jackson [Thu, 29 May 2008 15:57:05 +0000 (16:57 +0100)]
set CONFIG_DM

16 years agosdl_display_init takes four args
Ian Jackson [Thu, 29 May 2008 15:06:50 +0000 (16:06 +0100)]
sdl_display_init takes four args

16 years agodeclare domain_name and domid (via new config-host.h appendery)
Ian Jackson [Thu, 29 May 2008 15:03:26 +0000 (16:03 +0100)]
declare domain_name and domid (via new config-host.h appendery)

16 years agodeclare ds->dpy_colourdepth
Ian Jackson [Thu, 29 May 2008 14:52:28 +0000 (15:52 +0100)]
declare ds->dpy_colourdepth

16 years agoVncReadEvent funcs take a uint8_t* not a char*
Ian Jackson [Thu, 29 May 2008 14:50:44 +0000 (15:50 +0100)]
VncReadEvent funcs take a uint8_t* not a char*

int protocol_xxx(/*...*/) in vnc.c

16 years agoconsole_color_init => set_color_table like in qemu upstream
Ian Jackson [Thu, 29 May 2008 14:47:57 +0000 (15:47 +0100)]
console_color_init => set_color_table like in qemu upstream

16 years agoAdd ds->idle in console.h and sdl.c
Ian Jackson [Thu, 29 May 2008 14:45:21 +0000 (15:45 +0100)]
Add ds->idle in console.h and sdl.c

A few lost fragments of xen-unstable changeset
17607:3b20e543b52d40f76525a7e918fa347af2de00fe

    pvfb/ioemu: transmit refresh interval advice from backend to frontend
    which permits the frontend to avoid useless polls.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
16 years agoAdd vncunused option.
Ian Jackson [Thu, 29 May 2008 14:39:25 +0000 (15:39 +0100)]
Add vncunused option.

Remaining fragments of xen-unstable c/s
10998:bd04004865ba70a67fb797733ad1452d6b19b971

    If the port used for the requested display number is in use, try
    additional ports until a free port is found.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
16 years agoProvide qemu_advance_timer.
Ian Jackson [Thu, 29 May 2008 14:23:10 +0000 (15:23 +0100)]
Provide qemu_advance_timer.

This is a fragment of the following changeset from xen-unstable:

11562:449dcaff25513813da8bcda94ffc85f3f14c5857

  [HVM][VNC] Add a backoff feature to the vnc server, so that if it detects
  that the display hasn't changed for a while it starts scanning more slowly.

Signed-off-by: Steven Smith <sos22@cam.ac.uk>
16 years agobring timer arrangments into line with qemu upstream
Ian Jackson [Thu, 29 May 2008 14:22:18 +0000 (15:22 +0100)]
bring timer arrangments into line with qemu upstream

16 years agoDisable curses in our manual config, too
Ian Jackson [Thu, 29 May 2008 14:03:56 +0000 (15:03 +0100)]
Disable curses in our manual config, too

16 years agoAdd i386-dm/config.mak to gitignore
Ian Jackson [Thu, 29 May 2008 14:03:07 +0000 (15:03 +0100)]
Add i386-dm/config.mak to gitignore

16 years agoDisable curses for xen; protect xen-* configs from configure by removing links
Ian Jackson [Thu, 29 May 2008 14:01:59 +0000 (15:01 +0100)]
Disable curses for xen; protect xen-* configs from configure by removing links

16 years agomake DisplayState match xen-unstable better
Ian Jackson [Thu, 29 May 2008 13:58:02 +0000 (14:58 +0100)]
make DisplayState match xen-unstable better

16 years agokeycode_is_shiftable is static inline like in upstream
Ian Jackson [Wed, 28 May 2008 16:09:36 +0000 (17:09 +0100)]
keycode_is_shiftable is static inline like in upstream

16 years ago#include <assert.h>
Ian Jackson [Wed, 28 May 2008 14:42:52 +0000 (15:42 +0100)]
#include <assert.h>

16 years agokeyfooIsThing => keyfoo_is_thing - upstream naming conventions
Ian Jackson [Wed, 28 May 2008 14:42:36 +0000 (15:42 +0100)]
keyfooIsThing => keyfoo_is_thing - upstream naming conventions

16 years agokeyfooIsThing => keyfoo_is_thing - upstream naming conventions
Ian Jackson [Wed, 28 May 2008 14:41:47 +0000 (15:41 +0100)]
keyfooIsThing => keyfoo_is_thing - upstream naming conventions

16 years agoCorrect #includes for vnc.c
Ian Jackson [Wed, 28 May 2008 14:39:32 +0000 (15:39 +0100)]
Correct #includes for vnc.c

16 years agocompilation fixes to usb-hid queueing
Ian Jackson [Wed, 28 May 2008 13:50:04 +0000 (14:50 +0100)]
compilation fixes to usb-hid queueing

16 years agodeclare console_ch_t as now needed
Ian Jackson [Wed, 28 May 2008 13:40:06 +0000 (14:40 +0100)]
declare console_ch_t as now needed

16 years agoTake text_update argument to graphic_console_init, although we do not use it at the...
Ian Jackson [Wed, 28 May 2008 13:37:46 +0000 (14:37 +0100)]
Take text_update argument to graphic_console_init, although we do not use it at the moment

16 years agoUse symlink for xen config.mak
Ian Jackson [Tue, 27 May 2008 15:25:34 +0000 (16:25 +0100)]
Use symlink for xen config.mak

16 years agoFind XEN_ROOT more properly
Ian Jackson [Tue, 27 May 2008 15:24:44 +0000 (16:24 +0100)]
Find XEN_ROOT more properly

16 years agoWIP new xen build arrangments
Ian Jackson [Tue, 27 May 2008 15:24:14 +0000 (16:24 +0100)]
WIP new xen build arrangments

16 years agoRemove duplicate copy of bdrv_aio_flush
Ian Jackson [Tue, 27 May 2008 15:23:12 +0000 (16:23 +0100)]
Remove duplicate copy of bdrv_aio_flush

16 years agoMerge branch 'master' into xen
Ian Jackson [Tue, 27 May 2008 13:46:08 +0000 (14:46 +0100)]
Merge branch 'master' into xen

16 years agoRemove duplicated qemu_{malloc,free} and get_mmap_addr.
Ian Jackson [Tue, 27 May 2008 13:34:18 +0000 (14:34 +0100)]
Remove duplicated qemu_{malloc,free} and get_mmap_addr.

Related to apparently incomplete merge of:

 commit ca10f86763f58b7b3667e2ca7d26db3dc810eb20
 Author: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Date:   Fri Apr 11 21:35:42 2008 +0000

 Remove osdep.c/qemu-img code duplication

 (Kevin Wolf)

 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4191 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoMerge branch 'master' into xen
Ian Jackson [Fri, 23 May 2008 17:43:52 +0000 (18:43 +0100)]
Merge branch 'master' into xen

16 years agoMerge branch 'iwj.block-rw-rangecheck'
Ian Jackson [Fri, 23 May 2008 17:43:43 +0000 (18:43 +0100)]
Merge branch 'iwj.block-rw-rangecheck'

16 years agoFix COW extendability for vulnerability fix.
Ian Jackson [Fri, 23 May 2008 17:43:27 +0000 (18:43 +0100)]
Fix COW extendability for vulnerability fix.

(Thanks to report from Daniel Berrange.
 Corresponds to my email to xen-devel of 2008-02-27
 Subject: Re: [Xen-devel] [PATCH] ioemu block device extent checks.)

16 years agoFix qemu unchecked block read/write vulnerability
Ian Jackson [Fri, 23 May 2008 17:40:47 +0000 (18:40 +0100)]
Fix qemu unchecked block read/write vulnerability

(Patch as from my email to qemu-devel on 2008-02-19, merged with
 current qemu upstream head.)

16 years agoMerge branch 'master' into xen
Ian Jackson [Fri, 23 May 2008 17:28:28 +0000 (18:28 +0100)]
Merge branch 'master' into xen

Conflicts:
hw/ide.c

16 years agoMerge branch 'iu.pci-bus-save-load'
Ian Jackson [Fri, 23 May 2008 17:26:28 +0000 (18:26 +0100)]
Merge branch 'iu.pci-bus-save-load'

16 years agoCopy hw/pass-through.[ch] from xen-unstable 17647:f12724194ec6
Ian Jackson [Fri, 23 May 2008 17:23:48 +0000 (18:23 +0100)]
Copy hw/pass-through.[ch] from xen-unstable 17647:f12724194ec6

16 years agoCopy hw/tpm_tis.c from xen-unstable 17647:f12724194ec6
Ian Jackson [Fri, 23 May 2008 17:22:48 +0000 (18:22 +0100)]
Copy hw/tpm_tis.c from xen-unstable 17647:f12724194ec6

16 years agoMerge changes from xen-unstable 17647 with relevant upstream changes.
Ian Jackson [Fri, 23 May 2008 17:20:55 +0000 (18:20 +0100)]
Merge changes from xen-unstable 17647 with relevant upstream changes.

Now we consider ourselves up to date with
 (a) upstream as recorded by git
 (b) xen-unstable 17647:f12724194ec6

This was achieved by copying these files
   console.c
   console.h
   hw/cirrus_vga.c
   hw/cirrus_vga_rop.h
   hw/cirrus_vga_rop2.h
   hw/vga.c
   hw/vga_int.h
verbatim from the crazy branch vga-reverse-merge, current head
commit cc011fdf74a616fec9ab6841026c5e7121c0dce3.

We have effectively overwritten these files from qemu with those
from xen-unstable and then cherry-picked changes from qemu mainline.

16 years agoMerge changes from xen-unstable, up to 17647:f12724194ec6.
Ian Jackson [Thu, 22 May 2008 16:30:34 +0000 (17:30 +0100)]
Merge changes from xen-unstable, up to 17647:f12724194ec6.

Done with diff and patch.  Outstanding issues:

 pci.c irq save/restore change (xen-unstable hg c/s 17518)
 pci passthrough - files just copied across, not integrated
 build system
 VGA subsystem

16 years agoSend unit_attention on cd-rom not_ready to ready transition
Ian Jackson [Mon, 19 May 2008 15:21:52 +0000 (16:21 +0100)]
Send unit_attention on cd-rom not_ready to ready transition

Patch sends a UNIT_ATTENTION(6), MEDIUM_MAY_HAVE_CHANGED(0x28) sense
when cdrom transitions from not ready to ready.

I used the following documentation:
 ATA Packet interface for CD-ROMS, SFF8020i.pdf. See state diagram Figure
 12, page 82 and Table 44 -recommended Sense Key, ASC

With patch in place HVM win2008 server guest sees the CD/DVD contents
have changed when the media is switched.

Signed-off-by: Pat Campbell <plc@novell.com>
16 years agopci.c: restore bus-level pci interrupt state via pci_set_irq
Ian Jackson [Fri, 16 May 2008 16:04:57 +0000 (17:04 +0100)]
pci.c: restore bus-level pci interrupt state via pci_set_irq

This change abolishes pcibus_save.  Instead we use an invariant - that
device interrupts are supposed to be reflected in the bus interrupt
state - to restore the bus interrupt state.

This makes the code smaller and removes one way in which a savefile
could be corrupted (eg, if it had been generated by a buggy emulator).

It also means that systems which do some of their own PCI bus
emulation and thus reflect PCI bus state elsewhere (eg CPU acclerators
such as Xen) get notified of the PCI bus interrupt level, via
pci_set_irq's call to bus->set_irq.

16 years agoregister_savevm etc.: make save function optional
Ian Jackson [Fri, 16 May 2008 16:01:12 +0000 (17:01 +0100)]
register_savevm etc.: make save function optional

This allows a device to provide only a loading function, not a saving
function.

This is useful if a later version of an emulation restores its state
in some other way (eg by having a different device name, or by
exploiting invariants in the state); when this happens it is still
necessary to load or skip the information when it is found in old
savefiles.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agopcnet: Allow save/restore of multiple NICs
Ian Jackson [Wed, 14 May 2008 15:58:20 +0000 (16:58 +0100)]
pcnet: Allow save/restore of multiple NICs

Change imported from xen-unstable.  From the logs it's likely to have
been this changeset:

    changeset:   14651:f06535a8ae9fd43e3d4147dbab335a8d4827d9f6
    user:        Tim Deegan <Tim.Deegan@xensource.com>
    date:        Thu Mar 29 15:30:01 2007 +0000
    files:       tools/ioemu/hw/ne2000.c tools/ioemu/hw/pcnet.c tools/ioemu/hw/rtl8139.c
    description:
    [HVM] Save/restore: Allow save/restore of multiple NICs
Signed-off-by: Tim Deegan <Tim.Deegan@xenource.com>
16 years agoDo not kill ioemu if undefined LSI-SCI registers are read.
Ian Jackson [Wed, 14 May 2008 15:55:37 +0000 (16:55 +0100)]
Do not kill ioemu if undefined LSI-SCI registers are read.

Imported changeset from xen-unstable:

    changeset:   14902:a7bd11fd5b1b6f4a82135db09dfe654e8966fabe
    user:        kfraser@localhost.localdomain
    date:        Tue Apr 24 12:12:48 2007 +0100
    files:       tools/ioemu/hw/lsi53c895a.c
    description:
    qemu: Do not kill ioemu if undefined LSI-SCI registers are read. Just
    return zeroes. This path is triggered by ASPI8DOS.SYS in DRDOS.
Signed-off-by: Keir Fraser <keir@xensource.com>
However, this behaviour change was inexplicably made conditional on
CONFIG_DM.  I have removed the conditionality.

16 years agodma.c merged from xen-unstable 17318:b5fea3aeb04b
Ian Jackson [Wed, 14 May 2008 15:51:53 +0000 (16:51 +0100)]
dma.c merged from xen-unstable 17318:b5fea3aeb04b

changesets included:

    changeset:   14912:c1d3f4fbfacf7ea8eab9549823787f13efa2d976
    user:        Christian Limpach <Christian.Limpach@xensource.com>
    date:        Tue Apr 24 17:02:10 2007 +0100
    files:       tools/ioemu/hw/dma.c
    description:
    [qemu-dm] Check for null pointer in dma handler function pointer.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
    changeset:   16936:3daab9b636c121bc9d957568ea135b2f40776ca5
    user:        Keir Fraser <keir.fraser@citrix.com>
    date:        Wed Jan 30 09:33:26 2008 +0000
    files:       tools/ioemu/hw/dma.c tools/ioemu/hw/sb16.c
    description:
    ioemu: Better fix for SB16 infinite looping.

    Qemu upstream solves "Fix an infinite loop in the emulated SB16
    device" issue differently as stated in [2]

    [1] http://xenbits.xensource.com/xen-3.1-testing.hg?rev/4b22d472bda6
    [2] http://lists.gnu.org/archive/html/qemu-devel/2008-01/msg00709.html

Signed-off-by: S. Caglar Onur <caglar@pardus.org.tr>
16 years agoadd registration of bdrv_vbd for stubdom
Ian Jackson [Wed, 14 May 2008 15:47:50 +0000 (16:47 +0100)]
add registration of bdrv_vbd for stubdom

16 years agoStubdom changes to exec-all.h.
Ian Jackson [Wed, 14 May 2008 15:39:43 +0000 (16:39 +0100)]
Stubdom changes to exec-all.h.

16 years agoide: Add PCI subsystem ID to emulated devices.
Ian Jackson [Wed, 14 May 2008 15:18:35 +0000 (16:18 +0100)]
ide: Add PCI subsystem ID to emulated devices.

Merge into qemu git of this change to hw/ide.c from xen-unstable:

    changeset:   13821:6e1b380947ee72e300ce038cbeade628f347ac6a
    user:        kfraser@localhost.localdomain
    date:        Wed Feb 07 16:08:47 2007 +0000
    files:       tools/ioemu/hw/cirrus_vga.c tools/ioemu/hw/ide.c tools/ioemu/hw/rtl8139.c
    description:
    hvm: Add PCI subsystem ID to emulated devices.

    This patch adds the PCI Subsystem ID 5853:0001 to the virtual
    devices emulated by qemu (ide, nic, vga).

Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
16 years agoAccelerate IDE PIO on HVM/IA64
Ian Jackson [Wed, 14 May 2008 15:16:31 +0000 (16:16 +0100)]
Accelerate IDE PIO on HVM/IA64

Merge of this:

    changeset:   14151:b0f663e668d9e25c9c577f7a2100d9b3286101cd
    user:        kfraser@localhost.localdomain
    date:        Tue Feb 27 15:33:25 2007 +0000
    files:       tools/ioemu/hw/ide.c tools/ioemu/vl.c xen/include/public/hvm/ioreq.h
    description:
    Accelerate IDE PIO on HVM/IA64 [1/3]

    Add a bufferring mechanism for IDE PIO in qemu.

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
and associated gubbins.

16 years agoMerge branch 'master' into xen
Ian Jackson [Wed, 14 May 2008 15:06:15 +0000 (16:06 +0100)]
Merge branch 'master' into xen

Conflicts:

hw/ide.c
hw/pc.c
hw/serial.c
hw/usb-hid.c
loader.c
sysemu.h
vl.c

Merge was relatively straightforward.  Specific comments follow:

hw/serial.c
Have kept the Xen rate limiting rather than
the qemu version.  The Xen version does an overall
rate limit but doesn't adjust according to the
baud rate.  The qemu version is just a maximum
burst (so no overall capacity limit) but does
depend on the baud rate.

vl.c
Several dummy functions helpfully moved into
target-* directories; I put them in a new
i386-dm/machine.c for now.

16 years agoMerge branch 'origin'
Ian Jackson [Wed, 14 May 2008 13:45:40 +0000 (14:45 +0100)]
Merge branch 'origin'

Conflicts:
hw/ide.c
hw/pc.c
loader.c
osdep.c
osdep.h
qemu-common.h
(All easily resolved.)

16 years agoFix loading of binary ROMs
blueswir1 [Tue, 13 May 2008 15:44:10 +0000 (15:44 +0000)]
Fix loading of binary ROMs

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4452 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFix compiler warning.
ths [Tue, 13 May 2008 14:35:34 +0000 (14:35 +0000)]
Fix compiler warning.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4451 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoCRIS: Improve TLB management and handle delayslots at page boundaries.
edgar_igl [Tue, 13 May 2008 10:59:14 +0000 (10:59 +0000)]
CRIS: Improve TLB management and handle delayslots at page boundaries.
* Dont flush the entire qemu tlb when the $pid changes. Instead we go through
  the guests TLB and choose entries that need to be flushed.
* Add env->dslot and handle delayslots at pageboundaries.
* Remove some unused code.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4450 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agocompilation fix
bellard [Mon, 12 May 2008 22:55:35 +0000 (22:55 +0000)]
compilation fix

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4449 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agouse new helper name
bellard [Mon, 12 May 2008 22:05:33 +0000 (22:05 +0000)]
use new helper name

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4448 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoconverted more helpers to TCG
bellard [Mon, 12 May 2008 22:05:13 +0000 (22:05 +0000)]
converted more helpers to TCG

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4447 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoremoved unused code
bellard [Mon, 12 May 2008 22:03:14 +0000 (22:03 +0000)]
removed unused code

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4446 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoFPU fixes
bellard [Mon, 12 May 2008 20:30:28 +0000 (20:30 +0000)]
FPU fixes

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4445 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoconverted x87 FPU ops to TCG
bellard [Mon, 12 May 2008 19:10:44 +0000 (19:10 +0000)]
converted x87 FPU ops to TCG

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4444 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoMove prototype back to avoid a compiler warning
blueswir1 [Mon, 12 May 2008 17:59:14 +0000 (17:59 +0000)]
Move prototype back to avoid a compiler warning

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4443 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoRemove most uses of phys_ram_base (initial patch by Ian Jackson)
blueswir1 [Mon, 12 May 2008 17:22:13 +0000 (17:22 +0000)]
Remove most uses of phys_ram_base (initial patch by Ian Jackson)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4442 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoconverted SSE/MMX ops to TCG
bellard [Mon, 12 May 2008 16:47:36 +0000 (16:47 +0000)]
converted SSE/MMX ops to TCG

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4441 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoWrap long lines
blueswir1 [Mon, 12 May 2008 16:13:33 +0000 (16:13 +0000)]
Wrap long lines

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4440 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agouse TCG for MMX/SSE memory accesses
bellard [Mon, 12 May 2008 13:55:27 +0000 (13:55 +0000)]
use TCG for MMX/SSE memory accesses

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4439 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agotemporary hack to handle register shortage with dyngen for qemu_st64()
bellard [Mon, 12 May 2008 13:49:14 +0000 (13:49 +0000)]
temporary hack to handle register shortage with dyngen for qemu_st64()

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4438 c046a42c-6fe2-441c-8c8c-71466251a162

16 years ago2.6 kernels make int 5 a trap gate
bellard [Mon, 12 May 2008 12:23:31 +0000 (12:23 +0000)]
2.6 kernels make int 5 a trap gate

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4437 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agochar is only for strings
bellard [Mon, 12 May 2008 12:08:29 +0000 (12:08 +0000)]
char is only for strings

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4436 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agothe double/triple fault handling was not tested in user mode.
bellard [Mon, 12 May 2008 12:04:40 +0000 (12:04 +0000)]
the double/triple fault handling was not tested in user mode.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4435 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agoremoved unused code
bellard [Mon, 12 May 2008 12:00:46 +0000 (12:00 +0000)]
removed unused code

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4434 c046a42c-6fe2-441c-8c8c-71466251a162

16 years agousb-uhci: correctly deal with interrupt in asynchronous completion
Ian Jackson [Fri, 9 May 2008 16:18:55 +0000 (17:18 +0100)]
usb-uhci: correctly deal with interrupt in asynchronous completion

This is the result of merging the remaining changes from:

    changeset:   12775:60bbcf799384d779c2a561b9d9ba30f28e31d970
    user:        kfraser@localhost.localdomain
    date:        Thu Dec 07 11:52:26 2006 +0000
    files:       tools/ioemu/hw/usb-hid.c tools/ioemu/hw/usb-uhci.c
    description:
    [HVM] qemu mouse: Adds support for USB mouse/tablet status check and
    restricts Universal Host Controller interrupt generating when received
    NAK in interrupt transfer.

    According to usb spec, USB mouse/tablet device returns NAK to host
    controller if its status does not alter in interrupt transfer.
    And UHC should leave a TD active when receiving NAK and execute this
    incompleted TD in a subseqent frame. UHC only generates an interrupt
    on complete after the TD with ICO bit is completed.

    This patch make UHC & USB mouse/tablet behave consistently with spec.

Signed-off-by: Xinmei Huang <xinmei.huang@intel.com>
The tablet NAK support was already done in qemu, but there was still
what Xinmei Huang tell us is a spurious interrupt in the case of
submission for asynchronous completion.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoClear TD status field explicitly when it's fetched.
Ian Jackson [Fri, 9 May 2008 16:07:37 +0000 (17:07 +0100)]
Clear TD status field explicitly when it's fetched.

changeset:   13574:b064775fba7d838c99bcf11ca4fec6127e0e8792
user:        kfraser@localhost.localdomain
date:        Wed Jan 24 10:44:32 2007 +0000
files:       tools/ioemu/hw/usb-uhci.c
description:
[QEMU] Clear TD status field explicitly when it's fetched.

In current Qemu-dm, UHC will set some status bits of TD in status
updating stage, but never process the status bit if relevant condition
does not occur, leaving it as it is. When a TD is fetched with some
status bits are set to 1, it will return to Guest OS with these bits
set to 1 even this TD is executed successfully. Some Windows OS,
e.g. Windows 2000, will check status bits of TD in UHC interrupt
routine, treat it as a unsuccessful one if some status bits are set to
1 and discard the data. Other Windows OS just check USBSTS of UHC,
ignoring status field of TD unless the value of USBSTS indicates
occurrence of error.

With this patch, USB mouse/tablet in Windows 2000 works correctly.

Signed-off-by: Xinmei Huang <xinmei.huang@intel.com>
16 years agoQueue some mouse events.
Ian Jackson [Fri, 9 May 2008 14:50:33 +0000 (15:50 +0100)]
Queue some mouse events.

Inspired by xen-unstable changeset, but entirely rewritten:

  changeset:   17003:96b418cf047e6d869740efd3660ab175303a3148
  user:        Keir Fraser <keir.fraser@citrix.com>
  date:        Mon Feb 11 09:57:38 2008 +0000
  files:       tools/ioemu/hw/usb-hid.c tools/ioemu/sdl.c
  description:
  qemu: Queue mouse clicks.

  qemu doesn't enqueue mouse events, just records the latest mouse
  state. This can cause some lost mouse double clicks if the events are
  not processed fast enought. This patch implements a simple queue for
  left mouse click events.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c
Ian Jackson [Wed, 7 May 2008 17:44:26 +0000 (18:44 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c

merge this changeset from xen-unstable:

changeset:   12482:075f4ffdbbce5527ba525a515abe320703d17a0e
user:        kfraser@localhost.localdomain
date:        Fri Nov 17 10:34:08 2006 +0000
files:       tools/ioemu/hw/rtl8139.c
description:
[QEMU] rtl8139: Disallow chaining above 64K

As it stands the 8139C+ TX chaining is only bounded by realloc failure.
This is contrary to how the real hardware operates.  It also has DoS
potential when ioemu runs in dom0.

This patch makes any attempt to chain a frame beyond 64K fail
immediately.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c
Ian Jackson [Wed, 7 May 2008 17:43:30 +0000 (18:43 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c

merge this changeset from xen-unstable:

changeset:   13821:6e1b380947ee72e300ce038cbeade628f347ac6a
user:        kfraser@localhost.localdomain
date:        Wed Feb 07 16:08:47 2007 +0000
files:       tools/ioemu/hw/cirrus_vga.c tools/ioemu/hw/ide.c tools/ioemu/hw/rtl8139.c
description:
hvm: Add PCI subsystem ID to emulated devices.

This patch adds the PCI Subsystem ID 5853:0001 to the virtual
devices emulated by qemu (ide, nic, vga).

Signed-off-by: Gerd Hoffmann <kraxel@suse.de>
16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c
Ian Jackson [Wed, 7 May 2008 17:41:27 +0000 (18:41 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/rtl8139.c

merge this changeset from xen-unstable:

changeset:   14651:f06535a8ae9fd43e3d4147dbab335a8d4827d9f6
user:        Tim Deegan <Tim.Deegan@xensource.com>
date:        Thu Mar 29 15:30:01 2007 +0000
files:       tools/ioemu/hw/ne2000.c tools/ioemu/hw/pcnet.c tools/ioemu/hw/rtl8139.c
description:
[HVM] Save/restore: Allow save/restore of multiple NICs
Signed-off-by: Tim Deegan <Tim.Deegan@xenource.com>
16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/serial.c. Main stuff: 16550A...
Ian Jackson [Wed, 7 May 2008 16:58:47 +0000 (17:58 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/serial.c. Main stuff: 16550A support from Xen; loopback and IRQ changes from Qemu

16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/pci.c: e100; PCI hotplug
Ian Jackson [Wed, 7 May 2008 15:29:53 +0000 (16:29 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/pci.c: e100; PCI hotplug

16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/ne2000: security fixes and...
Ian Jackson [Wed, 7 May 2008 15:20:46 +0000 (16:20 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/ne2000: security fixes and ability to load/save multiple NICs

16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): hw/iommu: PAGE_SHIFT is 14 on...
Ian Jackson [Wed, 7 May 2008 14:53:28 +0000 (15:53 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): hw/iommu: PAGE_SHIFT is 14 on ia64

16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): merge keymap changes in xen...
Ian Jackson [Wed, 7 May 2008 14:14:55 +0000 (15:14 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): merge keymap changes in xen-unstable since qemu 0.9.0

16 years agomerge from in xen-unstable tip (17318:b5fea3aeb04b): record whether keys are shift...
Ian Jackson [Wed, 7 May 2008 14:11:07 +0000 (15:11 +0100)]
merge from in xen-unstable tip (17318:b5fea3aeb04b): record whether keys are shift as well as numlock, for the benefit of some fancier keymaps

16 years agomerge from in qemu upstream: "BSD portability fixes"
Ian Jackson [Tue, 6 May 2008 14:41:22 +0000 (15:41 +0100)]
merge from in qemu upstream: "BSD portability fixes"

From xen-unstable:

 changeset:   15970:04cc0e22a20a0bdf6ceefb016185175ee094ed30
 user:        Keir Fraser <keir@xensource.com>
 date:        Thu Sep 27 16:36:23 2007 +0100
 files:       tools/ioemu/audio/audio.c tools/ioemu/audio/mixeng.c tools/ioemu/audio/ossaudio.c tools/ioemu/block-raw.c tools/ioemu/block-vvfat.c tools/ioemu/bswap.h tools/ioemu/cutils.c tools/ioemu/monitor.c tools/ioemu/osdep.h tools/ioemu/target-i386-dm/exec-dm.c tools/ioemu/usb-linux.c tools/ioemu/vl.c tools/ioemu/vl.h tools/ioemu/vnc.c
 description:
 ioemu: Fixes for BSD.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Mostly merged.  Dropped the ctype.h casts since we have those already,
and also a few things that looked wrong.

16 years agomerge from in qemu upstream: "Attempt to fix incorrect colours on some BGR displays...
Ian Jackson [Tue, 6 May 2008 11:13:58 +0000 (12:13 +0100)]
merge from in qemu upstream: "Attempt to fix incorrect colours on some BGR displays"; slightly better determination of ds->bgr

16 years agomerge from in qemu upstream: start a possibly-paused VM on SDL_QUIT
Ian Jackson [Tue, 6 May 2008 11:09:27 +0000 (12:09 +0100)]
merge from in qemu upstream: start a possibly-paused VM on SDL_QUIT

16 years agomerge from in qemu upstream: break mistakenly concatenated lines near SDLK_DELETE
Ian Jackson [Tue, 6 May 2008 11:08:47 +0000 (12:08 +0100)]
merge from in qemu upstream: break mistakenly concatenated lines near SDLK_DELETE