* [Qemu-devel] [PULL 0/3] Xen tree 2014-08-01
@ 2014-08-01 16:00 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:00 UTC (permalink / raw)
To: Peter Maydell; +Cc: xen-devel, qemu-devel, Stefano Stabellini
The following changes since commit 541bbb07eb197a870661ed702ae1f15c7d46aea6:
Update version for v2.1.0 release (2014-08-01 13:31:29 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-20140801
for you to fetch changes up to b33a5bbfbaab6c1ce653a8e3665a18ca67de1456:
qemu: support xen hvm direct kernel boot (2014-08-01 15:58:12 +0000)
----------------------------------------------------------------
Chunyan Liu (1):
qemu: support xen hvm direct kernel boot
Roger Pau Monne (2):
xen: fix usage of ENODATA
tap-bsd: implement a FreeBSD only version of tap_open
hw/i386/pc.c | 25 +++++++++++++++++
hw/i386/pc_piix.c | 7 +++++
hw/i386/xen/xen_apic.c | 1 +
include/hw/i386/pc.h | 5 ++++
net/tap-bsd.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++-
xen-hvm.c | 7 +++--
6 files changed, 112 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PULL 0/3] Xen tree 2014-08-01
@ 2014-08-01 16:00 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:00 UTC (permalink / raw)
To: Peter Maydell; +Cc: xen-devel, qemu-devel, Stefano Stabellini
The following changes since commit 541bbb07eb197a870661ed702ae1f15c7d46aea6:
Update version for v2.1.0 release (2014-08-01 13:31:29 +0100)
are available in the git repository at:
git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-20140801
for you to fetch changes up to b33a5bbfbaab6c1ce653a8e3665a18ca67de1456:
qemu: support xen hvm direct kernel boot (2014-08-01 15:58:12 +0000)
----------------------------------------------------------------
Chunyan Liu (1):
qemu: support xen hvm direct kernel boot
Roger Pau Monne (2):
xen: fix usage of ENODATA
tap-bsd: implement a FreeBSD only version of tap_open
hw/i386/pc.c | 25 +++++++++++++++++
hw/i386/pc_piix.c | 7 +++++
hw/i386/xen/xen_apic.c | 1 +
include/hw/i386/pc.h | 5 ++++
net/tap-bsd.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++-
xen-hvm.c | 7 +++--
6 files changed, 112 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 1/3] xen: fix usage of ENODATA
2014-08-01 16:00 ` Stefano Stabellini
@ 2014-08-01 16:01 ` Stefano Stabellini
-1 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell
Cc: xen-devel, Stefano Stabellini, qemu-devel, Anthony Perard,
xen-devel, Roger Pau Monne
From: Roger Pau Monne <roger.pau@citrix.com>
ENODATA doesn't exist on FreeBSD, so ENODATA errors returned by the
hypervisor are translated to ENOENT.
Also, the error code is returned in errno if the call returns -1, so
compare the error code with the value in errno instead of the value
returned by the function.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
---
xen-hvm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/xen-hvm.c b/xen-hvm.c
index a2486cf..91de2e2 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -513,11 +513,14 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
start_addr >> TARGET_PAGE_BITS, npages,
bitmap);
if (rc < 0) {
- if (rc != -ENODATA) {
+#ifndef ENODATA
+#define ENODATA ENOENT
+#endif
+ if (errno == ENODATA) {
memory_region_set_dirty(framebuffer, 0, size);
DPRINTF("xen: track_dirty_vram failed (0x" TARGET_FMT_plx
", 0x" TARGET_FMT_plx "): %s\n",
- start_addr, start_addr + size, strerror(-rc));
+ start_addr, start_addr + size, strerror(errno));
}
return;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 1/3] xen: fix usage of ENODATA
@ 2014-08-01 16:01 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell
Cc: xen-devel, Stefano Stabellini, qemu-devel, Anthony Perard,
xen-devel, Roger Pau Monne
From: Roger Pau Monne <roger.pau@citrix.com>
ENODATA doesn't exist on FreeBSD, so ENODATA errors returned by the
hypervisor are translated to ENOENT.
Also, the error code is returned in errno if the call returns -1, so
compare the error code with the value in errno instead of the value
returned by the function.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
---
xen-hvm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/xen-hvm.c b/xen-hvm.c
index a2486cf..91de2e2 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -513,11 +513,14 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
start_addr >> TARGET_PAGE_BITS, npages,
bitmap);
if (rc < 0) {
- if (rc != -ENODATA) {
+#ifndef ENODATA
+#define ENODATA ENOENT
+#endif
+ if (errno == ENODATA) {
memory_region_set_dirty(framebuffer, 0, size);
DPRINTF("xen: track_dirty_vram failed (0x" TARGET_FMT_plx
", 0x" TARGET_FMT_plx "): %s\n",
- start_addr, start_addr + size, strerror(-rc));
+ start_addr, start_addr + size, strerror(errno));
}
return;
}
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 2/3] tap-bsd: implement a FreeBSD only version of tap_open
2014-08-01 16:00 ` Stefano Stabellini
@ 2014-08-01 16:01 ` Stefano Stabellini
-1 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell; +Cc: Roger Pau Monne, xen-devel, qemu-devel, Stefano Stabellini
From: Roger Pau Monne <roger.pau@citrix.com>
The current behaviour of tap_open for BSD systems differ greatly from
it's Linux counterpart. Since FreeBSD supports interface renaming and
tap device cloning by opening /dev/tap, implement a FreeBSD specific
version of tap_open that behaves like it's Linux counterpart.
This is specially important for toolstacks that use Qemu (like Xen
libxl), in order to have a unified behaviour across suported
platforms.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
net/tap-bsd.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 90f8a02..bf91bd0 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -27,12 +27,13 @@
#include "sysemu/sysemu.h"
#include "qemu/error-report.h"
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
#include <sys/ioctl.h>
#include <net/if.h>
#include <net/if_tap.h>
#endif
+#ifndef __FreeBSD__
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
int vnet_hdr_required, int mq_required)
{
@@ -108,6 +109,73 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
return fd;
}
+#else /* __FreeBSD__ */
+
+#define PATH_NET_TAP "/dev/tap"
+
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
+ int vnet_hdr_required, int mq_required)
+{
+ int fd, s, ret;
+ struct ifreq ifr;
+
+ TFR(fd = open(PATH_NET_TAP, O_RDWR));
+ if (fd < 0) {
+ error_report("could not open %s: %s", PATH_NET_TAP, strerror(errno));
+ return -1;
+ }
+
+ memset(&ifr, 0, sizeof(ifr));
+
+ ret = ioctl(fd, TAPGIFNAME, (void *)&ifr);
+ if (ret < 0) {
+ error_report("could not get tap interface name");
+ goto error;
+ }
+
+ if (ifname[0] != '\0') {
+ /* User requested the interface to have a specific name */
+ s = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (s < 0) {
+ error_report("could not open socket to set interface name");
+ goto error;
+ }
+ ifr.ifr_data = ifname;
+ ret = ioctl(s, SIOCSIFNAME, (void *)&ifr);
+ close(s);
+ if (ret < 0) {
+ error_report("could not set tap interface name");
+ goto error;
+ }
+ } else {
+ pstrcpy(ifname, ifname_size, ifr.ifr_name);
+ }
+
+ if (*vnet_hdr) {
+ /* BSD doesn't have IFF_VNET_HDR */
+ *vnet_hdr = 0;
+
+ if (vnet_hdr_required && !*vnet_hdr) {
+ error_report("vnet_hdr=1 requested, but no kernel "
+ "support for IFF_VNET_HDR available");
+ goto error;
+ }
+ }
+ if (mq_required) {
+ error_report("mq_required requested, but not kernel support"
+ "for IFF_MULTI_QUEUE available");
+ goto error;
+ }
+
+ fcntl(fd, F_SETFL, O_NONBLOCK);
+ return fd;
+
+error:
+ close(fd);
+ return -1;
+}
+#endif /* __FreeBSD__ */
+
int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{
return 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 2/3] tap-bsd: implement a FreeBSD only version of tap_open
@ 2014-08-01 16:01 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell; +Cc: Roger Pau Monne, xen-devel, qemu-devel, Stefano Stabellini
From: Roger Pau Monne <roger.pau@citrix.com>
The current behaviour of tap_open for BSD systems differ greatly from
it's Linux counterpart. Since FreeBSD supports interface renaming and
tap device cloning by opening /dev/tap, implement a FreeBSD specific
version of tap_open that behaves like it's Linux counterpart.
This is specially important for toolstacks that use Qemu (like Xen
libxl), in order to have a unified behaviour across suported
platforms.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
net/tap-bsd.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 90f8a02..bf91bd0 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -27,12 +27,13 @@
#include "sysemu/sysemu.h"
#include "qemu/error-report.h"
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
#include <sys/ioctl.h>
#include <net/if.h>
#include <net/if_tap.h>
#endif
+#ifndef __FreeBSD__
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
int vnet_hdr_required, int mq_required)
{
@@ -108,6 +109,73 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
return fd;
}
+#else /* __FreeBSD__ */
+
+#define PATH_NET_TAP "/dev/tap"
+
+int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
+ int vnet_hdr_required, int mq_required)
+{
+ int fd, s, ret;
+ struct ifreq ifr;
+
+ TFR(fd = open(PATH_NET_TAP, O_RDWR));
+ if (fd < 0) {
+ error_report("could not open %s: %s", PATH_NET_TAP, strerror(errno));
+ return -1;
+ }
+
+ memset(&ifr, 0, sizeof(ifr));
+
+ ret = ioctl(fd, TAPGIFNAME, (void *)&ifr);
+ if (ret < 0) {
+ error_report("could not get tap interface name");
+ goto error;
+ }
+
+ if (ifname[0] != '\0') {
+ /* User requested the interface to have a specific name */
+ s = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ if (s < 0) {
+ error_report("could not open socket to set interface name");
+ goto error;
+ }
+ ifr.ifr_data = ifname;
+ ret = ioctl(s, SIOCSIFNAME, (void *)&ifr);
+ close(s);
+ if (ret < 0) {
+ error_report("could not set tap interface name");
+ goto error;
+ }
+ } else {
+ pstrcpy(ifname, ifname_size, ifr.ifr_name);
+ }
+
+ if (*vnet_hdr) {
+ /* BSD doesn't have IFF_VNET_HDR */
+ *vnet_hdr = 0;
+
+ if (vnet_hdr_required && !*vnet_hdr) {
+ error_report("vnet_hdr=1 requested, but no kernel "
+ "support for IFF_VNET_HDR available");
+ goto error;
+ }
+ }
+ if (mq_required) {
+ error_report("mq_required requested, but not kernel support"
+ "for IFF_MULTI_QUEUE available");
+ goto error;
+ }
+
+ fcntl(fd, F_SETFL, O_NONBLOCK);
+ return fd;
+
+error:
+ close(fd);
+ return -1;
+}
+#endif /* __FreeBSD__ */
+
int tap_set_sndbuf(int fd, const NetdevTapOptions *tap)
{
return 0;
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL 3/3] qemu: support xen hvm direct kernel boot
2014-08-01 16:00 ` Stefano Stabellini
@ 2014-08-01 16:01 ` Stefano Stabellini
-1 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell; +Cc: xen-devel, Chunyan Liu, qemu-devel, Stefano.Stabellini
From: Chunyan Liu <cyliu@suse.com>
qemu side patch to support xen HVM direct kernel boot:
if -kernel exists, calls xen_load_linux(), which will read kernel/initrd
and add a linuxboot.bin or multiboot.bin option rom. The
linuxboot.bin/multiboot.bin will load kernel/initrd and jump to execute
kernel directly. It's working when xen uses seabios.
During this work, found the 'kvmvapic' is in option_rom list, it should
not be there in xen case. Set s->vapic_control = 0 in xen_apic_realize()
to handle that.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/pc.c | 25 +++++++++++++++++++++++++
hw/i386/pc_piix.c | 7 +++++++
hw/i386/xen/xen_apic.c | 1 +
include/hw/i386/pc.h | 5 +++++
4 files changed, 38 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2cf22b1..9e58982 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1190,6 +1190,31 @@ void pc_acpi_init(const char *default_dsdt)
}
}
+FWCfgState *xen_load_linux(const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ ram_addr_t below_4g_mem_size,
+ PcGuestInfo *guest_info)
+{
+ int i;
+ FWCfgState *fw_cfg;
+
+ assert(kernel_filename != NULL);
+
+ fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
+ rom_set_fw(fw_cfg);
+
+ load_linux(fw_cfg, kernel_filename, initrd_filename,
+ kernel_cmdline, below_4g_mem_size);
+ for (i = 0; i < nb_option_roms; i++) {
+ assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
+ !strcmp(option_rom[i].name, "multiboot.bin"));
+ rom_add_option(option_rom[i].name, option_rom[i].bootindex);
+ }
+ guest_info->fw_cfg = fw_cfg;
+ return fw_cfg;
+}
+
FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9694f88..4f22be8 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -182,6 +182,13 @@ static void pc_init1(MachineState *machine,
fw_cfg = pc_memory_init(machine, system_memory,
below_4g_mem_size, above_4g_mem_size,
rom_memory, &ram_memory, guest_info);
+ } else if (machine->kernel_filename != NULL) {
+ /* For xen HVM direct kernel boot, load linux here */
+ fw_cfg = xen_load_linux(machine->kernel_filename,
+ machine->kernel_cmdline,
+ machine->initrd_filename,
+ below_4g_mem_size,
+ guest_info);
}
gsi_state = g_malloc0(sizeof(*gsi_state));
diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index 63bb7f7..f5acd6a 100644
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -40,6 +40,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
{
APICCommonState *s = APIC_COMMON(dev);
+ s->vapic_control = 0;
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
"xen-apic-msi", APIC_SPACE_SIZE);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index f4b9b2b..863eefb 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -188,6 +188,11 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
MemoryRegion *pci_address_space);
+FWCfgState *xen_load_linux(const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ ram_addr_t below_4g_mem_size,
+ PcGuestInfo *guest_info);
FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 3/3] qemu: support xen hvm direct kernel boot
@ 2014-08-01 16:01 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2014-08-01 16:01 UTC (permalink / raw)
To: peter.maydell; +Cc: xen-devel, Chunyan Liu, qemu-devel, Stefano.Stabellini
From: Chunyan Liu <cyliu@suse.com>
qemu side patch to support xen HVM direct kernel boot:
if -kernel exists, calls xen_load_linux(), which will read kernel/initrd
and add a linuxboot.bin or multiboot.bin option rom. The
linuxboot.bin/multiboot.bin will load kernel/initrd and jump to execute
kernel directly. It's working when xen uses seabios.
During this work, found the 'kvmvapic' is in option_rom list, it should
not be there in xen case. Set s->vapic_control = 0 in xen_apic_realize()
to handle that.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/pc.c | 25 +++++++++++++++++++++++++
hw/i386/pc_piix.c | 7 +++++++
hw/i386/xen/xen_apic.c | 1 +
include/hw/i386/pc.h | 5 +++++
4 files changed, 38 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 2cf22b1..9e58982 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1190,6 +1190,31 @@ void pc_acpi_init(const char *default_dsdt)
}
}
+FWCfgState *xen_load_linux(const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ ram_addr_t below_4g_mem_size,
+ PcGuestInfo *guest_info)
+{
+ int i;
+ FWCfgState *fw_cfg;
+
+ assert(kernel_filename != NULL);
+
+ fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
+ rom_set_fw(fw_cfg);
+
+ load_linux(fw_cfg, kernel_filename, initrd_filename,
+ kernel_cmdline, below_4g_mem_size);
+ for (i = 0; i < nb_option_roms; i++) {
+ assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
+ !strcmp(option_rom[i].name, "multiboot.bin"));
+ rom_add_option(option_rom[i].name, option_rom[i].bootindex);
+ }
+ guest_info->fw_cfg = fw_cfg;
+ return fw_cfg;
+}
+
FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9694f88..4f22be8 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -182,6 +182,13 @@ static void pc_init1(MachineState *machine,
fw_cfg = pc_memory_init(machine, system_memory,
below_4g_mem_size, above_4g_mem_size,
rom_memory, &ram_memory, guest_info);
+ } else if (machine->kernel_filename != NULL) {
+ /* For xen HVM direct kernel boot, load linux here */
+ fw_cfg = xen_load_linux(machine->kernel_filename,
+ machine->kernel_cmdline,
+ machine->initrd_filename,
+ below_4g_mem_size,
+ guest_info);
}
gsi_state = g_malloc0(sizeof(*gsi_state));
diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index 63bb7f7..f5acd6a 100644
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -40,6 +40,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
{
APICCommonState *s = APIC_COMMON(dev);
+ s->vapic_control = 0;
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
"xen-apic-msi", APIC_SPACE_SIZE);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index f4b9b2b..863eefb 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -188,6 +188,11 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
MemoryRegion *pci_address_space);
+FWCfgState *xen_load_linux(const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ ram_addr_t below_4g_mem_size,
+ PcGuestInfo *guest_info);
FWCfgState *pc_memory_init(MachineState *machine,
MemoryRegion *system_memory,
ram_addr_t below_4g_mem_size,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Xen tree 2014-08-01
2014-08-01 16:00 ` Stefano Stabellini
@ 2014-08-04 12:06 ` Peter Maydell
-1 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2014-08-04 12:06 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel@lists.xensource.com Devel, QEMU Developers
On 1 August 2014 17:00, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following changes since commit 541bbb07eb197a870661ed702ae1f15c7d46aea6:
>
> Update version for v2.1.0 release (2014-08-01 13:31:29 +0100)
>
> are available in the git repository at:
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-20140801
>
> for you to fetch changes up to b33a5bbfbaab6c1ce653a8e3665a18ca67de1456:
>
> qemu: support xen hvm direct kernel boot (2014-08-01 15:58:12 +0000)
>
> ----------------------------------------------------------------
> Chunyan Liu (1):
> qemu: support xen hvm direct kernel boot
>
> Roger Pau Monne (2):
> xen: fix usage of ENODATA
> tap-bsd: implement a FreeBSD only version of tap_open
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PULL 0/3] Xen tree 2014-08-01
@ 2014-08-04 12:06 ` Peter Maydell
0 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2014-08-04 12:06 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel@lists.xensource.com Devel, QEMU Developers
On 1 August 2014 17:00, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following changes since commit 541bbb07eb197a870661ed702ae1f15c7d46aea6:
>
> Update version for v2.1.0 release (2014-08-01 13:31:29 +0100)
>
> are available in the git repository at:
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git xen-20140801
>
> for you to fetch changes up to b33a5bbfbaab6c1ce653a8e3665a18ca67de1456:
>
> qemu: support xen hvm direct kernel boot (2014-08-01 15:58:12 +0000)
>
> ----------------------------------------------------------------
> Chunyan Liu (1):
> qemu: support xen hvm direct kernel boot
>
> Roger Pau Monne (2):
> xen: fix usage of ENODATA
> tap-bsd: implement a FreeBSD only version of tap_open
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-08-04 12:07 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-01 16:00 [Qemu-devel] [PULL 0/3] Xen tree 2014-08-01 Stefano Stabellini
2014-08-01 16:00 ` Stefano Stabellini
2014-08-01 16:01 ` [Qemu-devel] [PULL 1/3] xen: fix usage of ENODATA Stefano Stabellini
2014-08-01 16:01 ` Stefano Stabellini
2014-08-01 16:01 ` [Qemu-devel] [PULL 2/3] tap-bsd: implement a FreeBSD only version of tap_open Stefano Stabellini
2014-08-01 16:01 ` Stefano Stabellini
2014-08-01 16:01 ` [Qemu-devel] [PULL 3/3] qemu: support xen hvm direct kernel boot Stefano Stabellini
2014-08-01 16:01 ` Stefano Stabellini
2014-08-04 12:06 ` [Qemu-devel] [PULL 0/3] Xen tree 2014-08-01 Peter Maydell
2014-08-04 12:06 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.