]> xenbits.xensource.com Git - qemu-xen-3.3-testing.git/log
qemu-xen-3.3-testing.git
16 years agoGet rid of pt_uninit.
Ian Jackson [Fri, 6 Jun 2008 16:01:12 +0000 (17:01 +0100)]
Get rid of pt_uninit.

This is a remaining fragment of xen-unstable c/s
17058:1cb8d51b4d77aba99890b909bf16a01dc3dbcb2a

    ioemu: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
16 years agoNo gdbstub in Xen DM
Ian Jackson [Fri, 6 Jun 2008 15:47:56 +0000 (16:47 +0100)]
No gdbstub in Xen DM

16 years agoMake direct pci config string a qemu option
Ian Jackson [Fri, 6 Jun 2008 15:45:02 +0000 (16:45 +0100)]
Make direct pci config string a qemu option

16 years agoProvide ldl_phys et al.
Ian Jackson [Fri, 6 Jun 2008 15:28:00 +0000 (16:28 +0100)]
Provide ldl_phys et al.

We implement these in the Xen DM case as simple unoptimised wrappers
around cpu_physical_memory_write.

Several were copied directly from this qemu upstream commit:

    commit aab33094073678d459ccaac5c60ea7533e8d1d8e
    Author: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
    Date:   Sun Oct 30 20:48:42 2005 +0000

more physical memory access functions

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

I handwrote the others in the same pattern.

16 years agoMake exec-dm.c compile in the new world.
Ian Jackson [Fri, 6 Jun 2008 15:16:43 +0000 (16:16 +0100)]
Make exec-dm.c compile in the new world.

16 years agoCompile monitor.c but with #undef TARGET_I386
Ian Jackson [Thu, 5 Jun 2008 14:36:30 +0000 (15:36 +0100)]
Compile monitor.c but with #undef TARGET_I386

16 years agoCorrect prototype for dpy_resize_shared (fix up merge damage)
Ian Jackson [Wed, 4 Jun 2008 17:17:20 +0000 (18:17 +0100)]
Correct prototype for dpy_resize_shared (fix up merge damage)

16 years agoUpdate to xen-unstable 17737 plus ds->resize_shared vs. ds_resize
Ian Jackson [Wed, 4 Jun 2008 17:14:41 +0000 (18:14 +0100)]
Update to xen-unstable 17737 plus ds->resize_shared vs. ds_resize

This one commit contains two substantial sets of changes:

 * All changes from xen-unstable from 17647 to 17737:c93a913c221f

 * Shared display buffer API revamp
    Patch from Stefano Stabellini <stefano.stabellini@eu.citrix.com>, to
    do shared display buffer stuff with a different (backward-compatible)
    API which avoids having to change all of the other display hardware
    models.  Stefano tells me this patch is likely to break stubdom in
    its current state.

The commit is the result of applying Stefano's patch to xen-unstable
hg 17737, then running  hg diff -r17647 tools/ioemu, applying the
output to the git tree with patch, and fixing up the conflicts (which
were easy).

To make future merges easier, I have included Stefano's patch rebased
to 17737 (the result of hg diff -r17737 from the above hg tree) here,
so that the base point for a future merge to a new xen-unstable tip is
easy to recreate.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
16 years agoCompilation exclusions - now we just have undefined references
Ian Jackson [Wed, 4 Jun 2008 15:45:54 +0000 (16:45 +0100)]
Compilation exclusions - now we just have undefined references

16 years agoCompilation fixes - helper2.c compiles now
Ian Jackson [Wed, 4 Jun 2008 15:43:19 +0000 (16:43 +0100)]
Compilation fixes - helper2.c compiles now

16 years agoAdd includes for xenstore.c for now.
Ian Jackson [Wed, 4 Jun 2008 15:39:35 +0000 (16:39 +0100)]
Add includes for xenstore.c for now.

We plan to get rid of xenstore.c, but for now to get helper2.c to
compile I've copied the declarations for functions in xenstore.c from
xen-unstable 17737:c93a913c221f.

16 years agoMore complication and #include fixes.
Ian Jackson [Wed, 4 Jun 2008 15:34:48 +0000 (16:34 +0100)]
More complication and #include fixes.

Including some more ia64-specific stuff copies from xen-unstable
tip 17737:c93a913c221f

16 years agoHeader file and argument order fixups for xen_machine_{fv,pv}.c
Ian Jackson [Wed, 4 Jun 2008 15:13:51 +0000 (16:13 +0100)]
Header file and argument order fixups for xen_machine_{fv,pv}.c

Includes copying some declarations from vl.h in xen-unstable
from c/s 17737:c93a913c221f.

16 years agoMore exclusions from libqemu.a
Ian Jackson [Tue, 3 Jun 2008 14:41:44 +0000 (15:41 +0100)]
More exclusions from libqemu.a

16 years agomove OBJS manipulation into xen-hooks.mak
Ian Jackson [Tue, 3 Jun 2008 14:30:38 +0000 (15:30 +0100)]
move OBJS manipulation into xen-hooks.mak

16 years agoFix up #includes
Ian Jackson [Tue, 3 Jun 2008 13:51:09 +0000 (14:51 +0100)]
Fix up #includes

16 years agoCompilation fixups for Xen piix4acpi (piix4_pm_init)
Ian Jackson [Tue, 3 Jun 2008 13:44:09 +0000 (14:44 +0100)]
Compilation fixups for Xen piix4acpi (piix4_pm_init)

Includes change to pc.c to cope with lack of i2c bus, which is not
offered to HVM guests.

16 years ago#include "sysemu.h", since vl.h is gone
Ian Jackson [Mon, 2 Jun 2008 16:18:19 +0000 (17:18 +0100)]
#include "sysemu.h", since vl.h is gone

16 years agoSort out includes for xen_blktap.c
Ian Jackson [Mon, 2 Jun 2008 16:16:00 +0000 (17:16 +0100)]
Sort out includes for xen_blktap.c

16 years agoCompilation fixes for leftovers from merge
Ian Jackson [Mon, 2 Jun 2008 15:56:18 +0000 (16:56 +0100)]
Compilation fixes for leftovers from merge

16 years agoblacklist apic.c - not for xen
Ian Jackson [Mon, 2 Jun 2008 14:55:05 +0000 (15:55 +0100)]
blacklist apic.c - not for xen

16 years ago#include "exec-all.h" for logfile
Ian Jackson [Mon, 2 Jun 2008 14:52:35 +0000 (15:52 +0100)]
#include "exec-all.h" for logfile

16 years agoTransplant {set,unset}_mm_mapping from xen-unstable.
Ian Jackson [Mon, 2 Jun 2008 14:51:27 +0000 (15:51 +0100)]
Transplant {set,unset}_mm_mapping from xen-unstable.

These were in vl.c, introduced in the giant qemu 0.8.1 commit
which is xen c/s 10673:b450f21472a0574fbc382f2f84ea0a8295aa6423.

They versions transplanted here were from xen-unstable tip
as of 17737:c93a913c221f.

16 years agoInitialise vga_ram_addr to 0.
Ian Jackson [Mon, 2 Jun 2008 14:37:15 +0000 (15:37 +0100)]
Initialise vga_ram_addr to 0.

This is not used in the Xen case.  In xen-unstable NULL is passed
directly in the calls to the various vga_init functions; in this
version we set vga_ram_addr to 0 as that's textually a smaller change.

16 years agoPost-merge compilation fixes and adjustments for pc initialisation (hw/pc.c)
Ian Jackson [Mon, 2 Jun 2008 14:22:06 +0000 (15:22 +0100)]
Post-merge compilation fixes and adjustments for pc initialisation (hw/pc.c)

16 years agoadd missing argument to cpu_x86_init
Ian Jackson [Mon, 2 Jun 2008 13:11:20 +0000 (14:11 +0100)]
add missing argument to cpu_x86_init

16 years ago#if out cpu_smm_update, not relevant for xen (hopefully)
Ian Jackson [Mon, 2 Jun 2008 13:10:59 +0000 (14:10 +0100)]
#if out cpu_smm_update, not relevant for xen (hopefully)

16 years agocast some things to size_t before printing them (sadly maybe not 64-bit clean?)
Ian Jackson [Mon, 2 Jun 2008 13:08:10 +0000 (14:08 +0100)]
cast some things to size_t before printing them (sadly maybe not 64-bit clean?)

16 years agoCompilation fix: dm i8259 does not use opaque at all
Ian Jackson [Mon, 2 Jun 2008 11:06:19 +0000 (12:06 +0100)]
Compilation fix: dm i8259 does not use opaque at all

16 years agoCombine common code in serial_init and serial_mm_init into serial_init_core.
Ian Jackson [Mon, 2 Jun 2008 11:02:17 +0000 (12:02 +0100)]
Combine common code in serial_init and serial_mm_init into serial_init_core.

This also allows us to revamp serial_mm_init so that it initialises
our newer driver, merged with xen-unstable.

16 years agoRemove spuriously merge-duplicated serial_mm_init
Ian Jackson [Mon, 2 Jun 2008 11:00:11 +0000 (12:00 +0100)]
Remove spuriously merge-duplicated serial_mm_init

16 years agoRemove spuriously merge-duplicated serial_mm_{read,write}[bwl]
Ian Jackson [Mon, 2 Jun 2008 10:47:42 +0000 (11:47 +0100)]
Remove spuriously merge-duplicated serial_mm_{read,write}[bwl]

16 years agoCompilation fixes - leftover stuff from merge
Ian Jackson [Mon, 2 Jun 2008 10:41:14 +0000 (11:41 +0100)]
Compilation fixes - leftover stuff from merge

16 years agoFix up broken comparison left over from merge
Ian Jackson [Mon, 2 Jun 2008 10:21:25 +0000 (11:21 +0100)]
Fix up broken comparison left over from merge

16 years agoCHR_IOCTL_SERIAL_{GET,SET}_TIOCM
Ian Jackson [Mon, 2 Jun 2008 10:20:34 +0000 (11:20 +0100)]
CHR_IOCTL_SERIAL_{GET,SET}_TIOCM

Remaining fragments of xen-unstable c/s
16537:bf21e00155b7dd76653c5340099ecedac7a7de08

    [QEMU-DM] Modem control line & msl/mcr register support.

    This patch enables handling of the modem/flow control lines of a
    serial port when the backend for the virtual port is a physical serial
    port. During initialization, it tries to load the msr with the
    detected status from the real port (this is consistent with physical
    uart, which starts with its msr values set according to the status of
    the modem status lines). If the ioctl returns -ENOTSUP, then the code
    assumes the backend is not a real serial port and will disable any
    further attempts to manipulate or read the physical port's line
    status.

    It's tries to be as "correct" as possible in its msr/msl handling,
    with the exception of modem line status change interrupts. A real
    16550 uart apparently have a delay time of 250ns between when a modem
    status line changes and the IRQ line goes high. In this patch, an
    "idle" port is polled for line status changes only if the guest has
    enabled UART_IER_MSI is enabled, and only polled every 10 ms.

Signed-off-by: Trolle Selander <trolle.selander@gmail.com>
16 years agoRemove merge-duplicated dma_phony_handler
Ian Jackson [Mon, 2 Jun 2008 10:12:42 +0000 (11:12 +0100)]
Remove merge-duplicated dma_phony_handler

16 years agobuild system more sanity ...
Ian Jackson [Fri, 30 May 2008 17:01:30 +0000 (18:01 +0100)]
build system more sanity ...

16 years agoxs_wire.h needs errno.h
Ian Jackson [Fri, 30 May 2008 16:49:01 +0000 (17:49 +0100)]
xs_wire.h needs errno.h

16 years agoDo not use dyngen.c in dyngen rule; leads to trouble with *.d
Ian Jackson [Fri, 30 May 2008 16:48:47 +0000 (17:48 +0100)]
Do not use dyngen.c in dyngen rule; leads to trouble with *.d

16 years agomore build system nonsense
Ian Jackson [Fri, 30 May 2008 16:44:04 +0000 (17:44 +0100)]
more build system nonsense

16 years agoRemove erroneously duplicated code
Ian Jackson [Fri, 30 May 2008 16:29:57 +0000 (17:29 +0100)]
Remove erroneously duplicated code

16 years agoAdd some #includes
Ian Jackson [Fri, 30 May 2008 16:29:38 +0000 (17:29 +0100)]
Add some #includes

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.