mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-28 05:50:37 +00:00
ee785fed5d
The -numa option to qemu is used to create [fake] numa nodes and expose them to the guest OS instance. There are a couple of issues with the -numa option: a) Max VCPU's that can be specified for a guest while using the qemu's -numa option is 64. Due to a typecasting issue when the number of VCPUs is > 32 the VCPUs don't show up under the specified [fake] numa nodes. b) KVM currently has support for 160VCPUs per guest. The qemu's -numa option has only support for upto 64VCPUs per guest. This patch addresses these two issues. Below are examples of (a) and (b) a) >32 VCPUs are specified with the -numa option: /usr/local/bin/qemu-system-x86_64 \ -enable-kvm \ 71:01:01 \ -net tap,ifname=tap0,script=no,downscript=no \ -vnc :4 ... Upstream qemu : -------------- QEMU 1.1.50 monitor - type 'help' for more information (qemu) info numa 6 nodes node 0 cpus: 0 1 2 3 4 5 6 7 8 9 32 33 34 35 36 37 38 39 40 41 node 0 size: 131072 MB node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 node 1 size: 131072 MB node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 node 2 size: 131072 MB node 3 cpus: 30 node 3 size: 131072 MB node 4 cpus: node 4 size: 131072 MB node 5 cpus: 31 node 5 size: 131072 MB With the patch applied : ----------------------- QEMU 1.1.50 monitor - type 'help' for more information (qemu) info numa 6 nodes node 0 cpus: 0 1 2 3 4 5 6 7 8 9 node 0 size: 131072 MB node 1 cpus: 10 11 12 13 14 15 16 17 18 19 node 1 size: 131072 MB node 2 cpus: 20 21 22 23 24 25 26 27 28 29 node 2 size: 131072 MB node 3 cpus: 30 31 32 33 34 35 36 37 38 39 node 3 size: 131072 MB node 4 cpus: 40 41 42 43 44 45 46 47 48 49 node 4 size: 131072 MB node 5 cpus: 50 51 52 53 54 55 56 57 58 59 node 5 size: 131072 MB b) >64 VCPUs specified with -numa option: /usr/local/bin/qemu-system-x86_64 \ -enable-kvm \ -cpu Westmere,+rdtscp,+pdpe1gb,+dca,+pdcm,+xtpr,+tm2,+est,+smx,+vmx,+ds_cpl,+monitor,+dtes64,+pclmuldq,+pbe,+tm,+ht,+ss,+acpi,+d-vnc :4 ... Upstream qemu : -------------- only 63 CPUs in NUMA mode supported. only 64 CPUs in NUMA mode supported. QEMU 1.1.50 monitor - type 'help' for more information (qemu) info numa 8 nodes node 0 cpus: 6 7 8 9 38 39 40 41 70 71 72 73 node 0 size: 65536 MB node 1 cpus: 10 11 12 13 14 15 16 17 18 19 42 43 44 45 46 47 48 49 50 51 74 75 76 77 78 79 node 1 size: 65536 MB node 2 cpus: 20 21 22 23 24 25 26 27 28 29 52 53 54 55 56 57 58 59 60 61 node 2 size: 65536 MB node 3 cpus: 30 62 node 3 size: 65536 MB node 4 cpus: node 4 size: 65536 MB node 5 cpus: node 5 size: 65536 MB node 6 cpus: 31 63 node 6 size: 65536 MB node 7 cpus: 0 1 2 3 4 5 32 33 34 35 36 37 64 65 66 67 68 69 node 7 size: 65536 MB With the patch applied : ----------------------- QEMU 1.1.50 monitor - type 'help' for more information (qemu) info numa 8 nodes node 0 cpus: 0 1 2 3 4 5 6 7 8 9 node 0 size: 65536 MB node 1 cpus: 10 11 12 13 14 15 16 17 18 19 node 1 size: 65536 MB node 2 cpus: 20 21 22 23 24 25 26 27 28 29 node 2 size: 65536 MB node 3 cpus: 30 31 32 33 34 35 36 37 38 39 node 3 size: 65536 MB node 4 cpus: 40 41 42 43 44 45 46 47 48 49 node 4 size: 65536 MB node 5 cpus: 50 51 52 53 54 55 56 57 58 59 node 5 size: 65536 MB node 6 cpus: 60 61 62 63 64 65 66 67 68 69 node 6 size: 65536 MB node 7 cpus: 70 71 72 73 74 75 76 77 78 79 Signed-off-by: Chegu Vinod <chegu_vinod@hp.com>, Jim Hull <jim.hull@hp.com>, Craig Hada <craig.hada@hp.com> Tested-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
192 lines
5.5 KiB
C
192 lines
5.5 KiB
C
#ifndef SYSEMU_H
|
|
#define SYSEMU_H
|
|
/* Misc. things related to the system emulator. */
|
|
|
|
#include "qemu-common.h"
|
|
#include "qemu-option.h"
|
|
#include "qemu-queue.h"
|
|
#include "qemu-timer.h"
|
|
#include "qapi-types.h"
|
|
#include "notify.h"
|
|
#include "main-loop.h"
|
|
|
|
/* vl.c */
|
|
|
|
extern const char *bios_name;
|
|
|
|
extern const char *qemu_name;
|
|
extern uint8_t qemu_uuid[];
|
|
int qemu_uuid_parse(const char *str, uint8_t *uuid);
|
|
#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
|
|
|
|
void runstate_init(void);
|
|
bool runstate_check(RunState state);
|
|
void runstate_set(RunState new_state);
|
|
int runstate_is_running(void);
|
|
typedef struct vm_change_state_entry VMChangeStateEntry;
|
|
typedef void VMChangeStateHandler(void *opaque, int running, RunState state);
|
|
|
|
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
|
|
void *opaque);
|
|
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
|
|
void vm_state_notify(int running, RunState state);
|
|
|
|
#define VMRESET_SILENT false
|
|
#define VMRESET_REPORT true
|
|
|
|
void vm_start(void);
|
|
void vm_stop(RunState state);
|
|
void vm_stop_force_state(RunState state);
|
|
|
|
typedef enum WakeupReason {
|
|
QEMU_WAKEUP_REASON_OTHER = 0,
|
|
QEMU_WAKEUP_REASON_RTC,
|
|
QEMU_WAKEUP_REASON_PMTIMER,
|
|
} WakeupReason;
|
|
|
|
void qemu_system_reset_request(void);
|
|
void qemu_system_suspend_request(void);
|
|
void qemu_register_suspend_notifier(Notifier *notifier);
|
|
void qemu_system_wakeup_request(WakeupReason reason);
|
|
void qemu_system_wakeup_enable(WakeupReason reason, bool enabled);
|
|
void qemu_register_wakeup_notifier(Notifier *notifier);
|
|
void qemu_system_shutdown_request(void);
|
|
void qemu_system_powerdown_request(void);
|
|
void qemu_system_debug_request(void);
|
|
void qemu_system_vmstop_request(RunState reason);
|
|
int qemu_shutdown_requested_get(void);
|
|
int qemu_reset_requested_get(void);
|
|
int qemu_shutdown_requested(void);
|
|
int qemu_reset_requested(void);
|
|
int qemu_powerdown_requested(void);
|
|
void qemu_system_killed(int signal, pid_t pid);
|
|
void qemu_kill_report(void);
|
|
extern qemu_irq qemu_system_powerdown;
|
|
void qemu_system_reset(bool report);
|
|
|
|
void qemu_add_exit_notifier(Notifier *notify);
|
|
void qemu_remove_exit_notifier(Notifier *notify);
|
|
|
|
void qemu_add_machine_init_done_notifier(Notifier *notify);
|
|
|
|
void do_savevm(Monitor *mon, const QDict *qdict);
|
|
int load_vmstate(const char *name);
|
|
void do_delvm(Monitor *mon, const QDict *qdict);
|
|
void do_info_snapshots(Monitor *mon);
|
|
|
|
void qemu_announce_self(void);
|
|
|
|
bool qemu_savevm_state_blocked(Error **errp);
|
|
int qemu_savevm_state_begin(QEMUFile *f,
|
|
const MigrationParams *params);
|
|
int qemu_savevm_state_iterate(QEMUFile *f);
|
|
int qemu_savevm_state_complete(QEMUFile *f);
|
|
void qemu_savevm_state_cancel(QEMUFile *f);
|
|
int qemu_loadvm_state(QEMUFile *f);
|
|
|
|
/* SLIRP */
|
|
void do_info_slirp(Monitor *mon);
|
|
|
|
typedef enum DisplayType
|
|
{
|
|
DT_DEFAULT,
|
|
DT_CURSES,
|
|
DT_SDL,
|
|
DT_NOGRAPHIC,
|
|
DT_NONE,
|
|
} DisplayType;
|
|
|
|
extern int autostart;
|
|
extern int bios_size;
|
|
|
|
typedef enum {
|
|
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
|
|
} VGAInterfaceType;
|
|
|
|
extern int vga_interface_type;
|
|
#define cirrus_vga_enabled (vga_interface_type == VGA_CIRRUS)
|
|
#define std_vga_enabled (vga_interface_type == VGA_STD)
|
|
#define xenfb_enabled (vga_interface_type == VGA_XENFB)
|
|
#define vmsvga_enabled (vga_interface_type == VGA_VMWARE)
|
|
#define qxl_enabled (vga_interface_type == VGA_QXL)
|
|
|
|
extern int graphic_width;
|
|
extern int graphic_height;
|
|
extern int graphic_depth;
|
|
extern DisplayType display_type;
|
|
extern const char *keyboard_layout;
|
|
extern int win2k_install_hack;
|
|
extern int alt_grab;
|
|
extern int ctrl_grab;
|
|
extern int usb_enabled;
|
|
extern int smp_cpus;
|
|
extern int max_cpus;
|
|
extern int cursor_hide;
|
|
extern int graphic_rotate;
|
|
extern int no_quit;
|
|
extern int no_shutdown;
|
|
extern int semihosting_enabled;
|
|
extern int old_param;
|
|
extern int boot_menu;
|
|
extern uint8_t *boot_splash_filedata;
|
|
extern int boot_splash_filedata_size;
|
|
extern uint8_t qemu_extra_params_fw[2];
|
|
extern QEMUClock *rtc_clock;
|
|
|
|
#define MAX_NODES 64
|
|
#define MAX_CPUMASK_BITS 255
|
|
extern int nb_numa_nodes;
|
|
extern uint64_t node_mem[MAX_NODES];
|
|
extern unsigned long *node_cpumask[MAX_NODES];
|
|
|
|
#define MAX_OPTION_ROMS 16
|
|
typedef struct QEMUOptionRom {
|
|
const char *name;
|
|
int32_t bootindex;
|
|
} QEMUOptionRom;
|
|
extern QEMUOptionRom option_rom[MAX_OPTION_ROMS];
|
|
extern int nb_option_roms;
|
|
|
|
#define MAX_PROM_ENVS 128
|
|
extern const char *prom_envs[MAX_PROM_ENVS];
|
|
extern unsigned int nb_prom_envs;
|
|
|
|
/* pci-hotplug */
|
|
void pci_device_hot_add(Monitor *mon, const QDict *qdict);
|
|
int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
|
|
DriveInfo *dinfo, int type);
|
|
void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
|
|
|
|
/* generic hotplug */
|
|
void drive_hot_add(Monitor *mon, const QDict *qdict);
|
|
|
|
/* pcie aer error injection */
|
|
void pcie_aer_inject_error_print(Monitor *mon, const QObject *data);
|
|
int do_pcie_aer_inject_error(Monitor *mon,
|
|
const QDict *qdict, QObject **ret_data);
|
|
|
|
/* serial ports */
|
|
|
|
#define MAX_SERIAL_PORTS 4
|
|
|
|
extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];
|
|
|
|
/* parallel ports */
|
|
|
|
#define MAX_PARALLEL_PORTS 3
|
|
|
|
extern CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
|
|
|
|
void do_usb_add(Monitor *mon, const QDict *qdict);
|
|
void do_usb_del(Monitor *mon, const QDict *qdict);
|
|
void usb_info(Monitor *mon);
|
|
|
|
void rtc_change_mon_event(struct tm *tm);
|
|
|
|
void register_devices(void);
|
|
|
|
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
|
|
const char *suffix);
|
|
char *get_boot_devices_list(uint32_t *size);
|
|
#endif
|